diff --git a/cmake/FindMSGFMT.cmake b/cmake/FindMSGFMT.cmake
deleted file mode 100644
index 393c3a9b..00000000
--- a/cmake/FindMSGFMT.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-# - FindMSGFMT.cmake for Hugin 0.7
-# file taken from rosegarden
-#
-# Find the gnu gettext msgfmt and msgmerge programs and define
-# a macro that calls it to add message translations
-#
-# Defined variables:
-#  MSGFMT_FOUND
-#  MSGFMT_EXECUTABLE
-#  MSGMERGE_FOUND
-#  MSGMERGE_EXECUTABLE
-#
-# Macro:
-#  ADD_TRANSLATIONS
-#
-# mod for Windows build 07Nov2007 TKSharpless --
-#   look in C:\MinGW after std. Unix places, that's where 
-#   gettext automatically installed itself on my system.
-# TODO find where else on Windows, Mac, etc gettext might be
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-IF(MSGFMT_EXECUTABLE)
-    SET(MSGFMT_FOUND TRUE)
-ELSE(MSGFMT_EXECUTABLE)
-    FIND_PROGRAM(MSGFMT_EXECUTABLE NAMES msgfmt gmsgfmt msgfmt.exe
-                                   PATHS /bin /usr/bin /usr/local/bin c:/MinGW/bin ${SOURCE_BASE_DIR}/gettext/bin)
-    IF(MSGFMT_EXECUTABLE)
-        SET(MSGFMT_FOUND TRUE)
-    ELSE(MSGFMT_EXECUTABLE)
-        IF(NOT MSGFMT_FIND_QUIETLY)
-            IF(MSGFMT_FIND_REQUIRED)
-                MESSAGE(FATAL_ERROR "msgfmt program couldn't be found")
-            ENDIF(MSGFMT_FIND_REQUIRED)
-        ENDIF(NOT MSGFMT_FIND_QUIETLY)
-    ENDIF(MSGFMT_EXECUTABLE)
-    MARK_AS_ADVANCED(MSGFMT_EXECUTABLE)
-ENDIF (MSGFMT_EXECUTABLE)
-
-IF(MSGMERGE_EXECUTABLE)
-    SET(MSGMERGE_FOUND TRUE)
-ELSE(MSGMERGE_EXECUTABLE)
-    FIND_PROGRAM(MSGMERGE_EXECUTABLE NAMES msgmerge gmsgmerge msgmerge.exe
-                                     PATHS /bin /usr/bin /usr/local/bin c:/MinGW/bin ${SOURCE_BASE_DIR}/gettext/bin)
-    IF(MSGMERGE_EXECUTABLE)
-        SET(MSGMERGE_FOUND TRUE)
-    ELSE(MSGMERGE_EXECUTABLE)
-        IF(NOT MSGMERGE_FIND_QUIETLY)
-            IF(MSGMERGE_FIND_REQUIRED)
-                MESSAGE(FATAL_ERROR "msgmerge program couldn't be found")
-            ENDIF(MSGMERGE_FIND_REQUIRED)
-        ENDIF(NOT MSGMERGE_FIND_QUIETLY)
-    ENDIF(MSGMERGE_EXECUTABLE)
-    MARK_AS_ADVANCED(MSGMERGE_EXECUTABLE)
-ENDIF (MSGMERGE_EXECUTABLE)
-
-MACRO(UPDATE_TRANSLATIONS _baseName)
-    SET(_outputs)
-    FOREACH(_file ${ARGN})
-        GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
-        SET(_out  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
-        SET(_ref "${CMAKE_CURRENT_SOURCE_DIR}/${_baseName}.pot")
-        ADD_CUSTOM_COMMAND(OUTPUT ${_out}
-                           COMMAND ${MSGMERGE_EXECUTABLE} ${_out} ${_ref}
-                           DEPENDS ${_ref})
-        SET(_outputs ${_outputs} ${_out})
-    ENDFOREACH(_file)
-    SET(MSGMERGE_TARGET update_translations_${_baseName})
-    ADD_CUSTOM_TARGET(${MSGMERGE_TARGET} ALL DEPENDS ${_outputs})
-ENDMACRO(UPDATE_TRANSLATIONS)
-
-MACRO(ADD_TRANSLATIONS _baseName)
-    SET(_outputs)
-    FOREACH(_file ${ARGN})
-        GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
-        SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.gmo")
-        SET(_in  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
-        ADD_CUSTOM_COMMAND(
-            OUTPUT ${_out}
-            COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
-            DEPENDS ${_in} )
-        INSTALL(FILES ${_out}
-            DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_file_we}/LC_MESSAGES/
-            RENAME ${_baseName}.mo )
-        SET(_outputs ${_outputs} ${_out})
-    ENDFOREACH(_file)
-    SET(MSGFMT_TARGET translations${_baseName})
-    ADD_CUSTOM_TARGET(${MSGFMT_TARGET} ALL DEPENDS ${_outputs})
-ENDMACRO(ADD_TRANSLATIONS)
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a45a61cd..7cafa1cd 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,46 +1,19 @@
-# CMakeLists.txt for i18n files
-find_package(MSGFMT REQUIRED)
-if(MSGFMT_FOUND)
-    message(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})")
-else()
-    message(FATAL_ERROR "msgfmt not found")
-endif()
+find_package(Gettext REQUIRED)
 
-# List of files PO files
-set(PO_FILES bs.po
-             de.po
-             es.po
-             fi.po
-             fr.po
-             gl.po
-             ms.po
-             pl.po
-             pt.po
-             ru.po
-             sk.po
-             sv.po
-             ug.po
-             uk.po
-             vi.po
+GETTEXT_CREATE_TRANSLATIONS(exiv2.pot ALL 
+    bs.po
+    de.po
+    es.po
+    fi.po
+    fr.po
+    gl.po
+    ms.po
+    pl.po
+    pt.po
+    ru.po
+    sk.po
+    sv.po
+    ug.po
+    uk.po
+    vi.po
 )
-
-update_translations(exiv2 ${PO_FILES})
-add_translations(exiv2 ${PO_FILES})
-
-##
-# execute xgettext on every file
-add_custom_target( pot-update
-    COMMAND xgettext --default-domain ${PROJECT_NAME}
-    --sort-output --directory ${CMAKE_CURRENT_SOURCE_DIR}/..
-    --output ${PROJECT_NAME}.pot
-    --output-dir ${CMAKE_CURRENT_SOURCE_DIR}/
-    --from-code=UTF-8  --files-from=POTFILES.in
-    -j
-    --keyword=_
-    --package-name=${PROJECT_NAME}
-    --package-version=${PROJECT_VERSION}
-    --msgid-bugs-address=${PACKAGE_BUGREPORT}
-)
-
-# That's all Folks!
-##