diff --git a/CMakeLists.txt b/CMakeLists.txt
index d64ad2166..c7ef3c547 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,9 +66,9 @@ macro_optional_add_subdirectory( si )
 macro_optional_add_subdirectory( sk )
 macro_optional_add_subdirectory( sl )
 macro_optional_add_subdirectory( sr )
-macro_optional_add_subdirectory( sr@latin )
 macro_optional_add_subdirectory( sr@ijekavian )
 macro_optional_add_subdirectory( sr@ijekavianlatin )
+macro_optional_add_subdirectory( sr@latin )
 macro_optional_add_subdirectory( sv )
 macro_optional_add_subdirectory( tg )
 macro_optional_add_subdirectory( th )
diff --git a/ast/CMakeLists.txt b/ast/CMakeLists.txt
index a3a0b569f..64793ca79 100644
--- a/ast/CMakeLists.txt
+++ b/ast/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-ast)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG ast)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index a3a0b569f..dd9764c53 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-be)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG be)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index a3a0b569f..d9a6f85c9 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-eo)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG eo)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/hne/CMakeLists.txt b/hne/CMakeLists.txt
index a3a0b569f..21ae1823f 100644
--- a/hne/CMakeLists.txt
+++ b/hne/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-hne)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG hne)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/ku/CMakeLists.txt b/ku/CMakeLists.txt
index a3a0b569f..c3629b2c2 100644
--- a/ku/CMakeLists.txt
+++ b/ku/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-ku)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG ku)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/mai/CMakeLists.txt b/mai/CMakeLists.txt
index a3a0b569f..d556d0a67 100644
--- a/mai/CMakeLists.txt
+++ b/mai/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-mai)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG mai)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/ms/CMakeLists.txt b/ms/CMakeLists.txt
index a3a0b569f..e4d231833 100644
--- a/ms/CMakeLists.txt
+++ b/ms/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-ms)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG ms)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/oc/CMakeLists.txt b/oc/CMakeLists.txt
index a3a0b569f..8bce4ca6f 100644
--- a/oc/CMakeLists.txt
+++ b/oc/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-oc)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG oc)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/se/CMakeLists.txt b/se/CMakeLists.txt
index a3a0b569f..b41848f2e 100644
--- a/se/CMakeLists.txt
+++ b/se/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-se)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG se)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/si/CMakeLists.txt b/si/CMakeLists.txt
index a3a0b569f..595c88301 100644
--- a/si/CMakeLists.txt
+++ b/si/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-si)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG si)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/sr/scripts/CMakeInclude.cmake b/sr/scripts/CMakeInclude.cmake
index 8acfc4d5f..0c250cb6c 100644
--- a/sr/scripts/CMakeInclude.cmake
+++ b/sr/scripts/CMakeInclude.cmake
@@ -18,6 +18,6 @@ if(PYTHONINTERP_FOUND)
                 DESTINATION ${LOCALE_INSTALL_DIR}/${CURRENT_LANG}/LC_SCRIPTS/${_tsmodule})
         set(_tscfiles ${_tscfiles} ${_tscfile})
         string(REPLACE "/" "-" _target ${_subtsfile})
-        add_custom_target("pmapc-${_target}" ALL DEPENDS ${_tscfiles})
+        add_custom_target("pmapc-${CURRENT_LANG}_${_target}" ALL DEPENDS ${_tscfiles})
     endforeach()
 endif()
diff --git a/sr@ijekavian/scripts/CMakeInclude.cmake b/sr@ijekavian/scripts/CMakeInclude.cmake
index 8acfc4d5f..596c16dba 100644
--- a/sr@ijekavian/scripts/CMakeInclude.cmake
+++ b/sr@ijekavian/scripts/CMakeInclude.cmake
@@ -18,6 +18,6 @@ if(PYTHONINTERP_FOUND)
                 DESTINATION ${LOCALE_INSTALL_DIR}/${CURRENT_LANG}/LC_SCRIPTS/${_tsmodule})
         set(_tscfiles ${_tscfiles} ${_tscfile})
         string(REPLACE "/" "-" _target ${_subtsfile})
-        add_custom_target("pmapc-${_target}" ALL DEPENDS ${_tscfiles})
+        add_custom_target("pmapc-sr_ijekavian_${_target}" ALL DEPENDS ${_tscfiles})
     endforeach()
 endif()
diff --git a/sr@latin/scripts/CMakeInclude.cmake b/sr@latin/scripts/CMakeInclude.cmake
index 8acfc4d5f..351059d64 100644
--- a/sr@latin/scripts/CMakeInclude.cmake
+++ b/sr@latin/scripts/CMakeInclude.cmake
@@ -18,6 +18,6 @@ if(PYTHONINTERP_FOUND)
                 DESTINATION ${LOCALE_INSTALL_DIR}/${CURRENT_LANG}/LC_SCRIPTS/${_tsmodule})
         set(_tscfiles ${_tscfiles} ${_tscfile})
         string(REPLACE "/" "-" _target ${_subtsfile})
-        add_custom_target("pmapc-${_target}" ALL DEPENDS ${_tscfiles})
+        add_custom_target("pmapc-sr_latin_${_target}" ALL DEPENDS ${_tscfiles})
     endforeach()
 endif()
diff --git a/tg/CMakeLists.txt b/tg/CMakeLists.txt
index a3a0b569f..8678c2bac 100644
--- a/tg/CMakeLists.txt
+++ b/tg/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-tg)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG tg)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )
diff --git a/th/CMakeLists.txt b/th/CMakeLists.txt
index a3a0b569f..316f5cc4b 100644
--- a/th/CMakeLists.txt
+++ b/th/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(kde-i18n-ar)
+project(kde-i18n-th)
 
 # Search KDE installation
 find_package(KDE4 REQUIRED)
@@ -14,7 +14,7 @@ IF(NOT GETTEXT_MSGFMT_EXECUTABLE)
    MESSAGE(FATAL_ERROR "Please install the msgfmt binary")
 endif (NOT GETTEXT_MSGFMT_EXECUTABLE)
 
-set(CURRENT_LANG ar)
+set(CURRENT_LANG th)
 
 macro_optional_add_subdirectory( messages )
 macro_optional_add_subdirectory( scripts )