diff --git a/development/cmake/po/CMakeLists.txt b/development/cmake/po/CMakeLists.txt
index cd9dfae81b..af4c5d637f 100755
--- a/development/cmake/po/CMakeLists.txt
+++ b/development/cmake/po/CMakeLists.txt
@@ -12,7 +12,11 @@ include_directories(${TOP_SRC_DIR}/po)
 SET(_lyxname ${PACKAGE})
 SET(_py_sources)
 macro(add_gettext_python  _par _dir)
-  file(GLOB _sources ${TOP_SRC_DIR}/${_dir}/${ARGN})
+  set(_sources)
+  foreach(_arg ${ARGN})
+    file(GLOB _s1 ${TOP_SRC_DIR}/${_dir}/${_arg})
+    list(APPEND _sources ${_s1})
+  endforeach(_arg)
   SET(_dst "${CMAKE_CURRENT_BINARY_DIR}/${_par}_l10n.pot")
   ADD_CUSTOM_COMMAND(
     OUTPUT "${_dst}"
@@ -29,13 +33,13 @@ SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.cat.pot" GE
 SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.fmt.pot" GENERATED)
 SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot" GENERATED)
 
+add_gettext_python(qt4 src/frontends/qt4/ui *.ui)
+add_gettext_python(layouts lib/layouts *.layout *.inc *.module)
+add_gettext_python(languages lib languages)
 add_gettext_python(encodings lib encodings)
+add_gettext_python(ui lib/ui *.ui *.inc)
 add_gettext_python(external lib external_templates)
 add_gettext_python(formats lib configure.py)
-add_gettext_python(languages lib languages)
-add_gettext_python(layouts lib/layouts *.layouts *.inc *.module)
-add_gettext_python(qt4 src/frontends/qt4/ui *.ui)
-add_gettext_python(ui lib/ui *.ui *.inc)
 
 FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
 FIND_PROGRAM(GETTEXT_MSGUNIQ_EXECUTABLE msguniq)
@@ -63,7 +67,7 @@ ADD_CUSTOM_COMMAND(
 SET(_potfiles_dep)
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.in "")
-foreach(_dir src src/frontends/qt4 src/insets src/mathed src/support src/tex2lyx)
+foreach(_dir src/frontends/qt4 src/insets src/mathed src/support src/tex2lyx src)
     file(GLOB _tmp_potfiles RELATIVE ${TOP_SRC_DIR} ${TOP_SRC_DIR}/${_dir}/*.cpp)
     foreach(_f ${_tmp_potfiles})
 	LIST(APPEND _potfiles_dep "${TOP_SRC_DIR}/${_f}")