diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index f5cddee5..dad0ffa4 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -32,6 +32,8 @@
 # automatically include all po files in the directory
 FILE(GLOB PO_FILES *.po)
 
+ADD_TRANSLATIONS(exiv2 ${PO_FILES})
+
 ADD_CUSTOM_TARGET( pot-update
                    COMMAND xgettext -d ${PACKAGE_NAME}
                                     -s
@@ -47,33 +49,3 @@ ADD_CUSTOM_TARGET( pot-update
                                     --copyright-holder=${PACKAGE_COPYRIGHT}
                                     --msgid-bugs-address=${PACKAGE_BUGREPORT}
                  )
-
-# .mo files creation and .po files update
-
-FOREACH (PO_CURRENT ${PO_FILES})
-    GET_FILENAME_COMPONENT(langue
-                           ${PO_CURRENT}
-                           NAME_WE
-                          )
-
-    SET(MO_FILE ${langue}.mo)
-    ADD_CUSTOM_COMMAND(TARGET update_pot
-                       POST_BUILD
-                       COMMAND msgmerge --update ./${PO_CURRENT} ./${PACKAGE_NAME}.pot
-                       DEPENDS ${PO_CURRENT} ${pot_file}
-    )
-
-    ADD_CUSTOM_COMMAND(
-        OUTPUT ${MO_FILE}
-        COMMAND msgfmt -c ${CMAKE_CURRENT_SOURCE_DIR}/${PO_CURRENT} -o ${CMAKE_CURRENT_SOURCE_DIR}/${langue}.mo
-    )
-
-    INSTALL(FILES ${langue}.gmo
-            DESTINATION ${LOCALEDIR}/po/locale/${langue}/LC_MESSAGES
-            RENAME ${langue}.mo
-           )
-
-    SET( POS_CURRENT ${POS_CURRENT} ${PO_CURRENT})
-ENDFOREACH (PO_CURRENT)
-
-ADD_CUSTOM_TARGET(build_mo ALL DEPENDS ${POS_CURRENT})
diff --git a/po/exiv2.pot b/po/exiv2.pot
index 35063730..453ad935 100644
--- a/po/exiv2.pot
+++ b/po/exiv2.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: exiv2 0.19.1\n"
 "Report-Msgid-Bugs-To: ahuggel@gmx.net\n"
-"POT-Creation-Date: 2010-04-21 13:54+0200\n"
+"POT-Creation-Date: 2010-04-21 14:19+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"