diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b8347473..43f5bd8f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,7 @@ include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
+include(ECMPoQmTools)
 
 # Output dirs (like ECM 5.38 does)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
diff --git a/src/Messages.sh b/src/Messages.sh
new file mode 100644
index 000000000..474eb2432
--- /dev/null
+++ b/src/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui' | grep -v '/plugins/'` -o $podir/falkon_qt.pot
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 6dd343e14..f636675e1 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
 if (${CMAKE_SYSTEM} MATCHES "OS2")
     set(SRCS ${SRCS} appicon_os2.rc)
 endif()
+ecm_create_qm_loader(SRCS falkon_qt)
 add_executable(falkon ${SRCS})
 
 target_link_libraries(falkon FalkonPrivate)
@@ -32,8 +33,8 @@ endif()
 
 if (UNIX AND NOT APPLE)
     install(TARGETS falkon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-    #install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/locale DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/falkon)
+    ecm_install_po_files_as_qm(${CMAKE_SOURCE_DIR}/po)
 
     install(PROGRAMS ../../linux/applications/org.kde.falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
diff --git a/src/plugins/AutoScroll/CMakeLists.txt b/src/plugins/AutoScroll/CMakeLists.txt
index 0382c6e51..dc3aaa18f 100644
--- a/src/plugins/AutoScroll/CMakeLists.txt
+++ b/src/plugins/AutoScroll/CMakeLists.txt
@@ -5,6 +5,8 @@ set( AutoScroll_SRCS
 	autoscrollsettings.cpp
 	)
 
+ecm_create_qm_loader( AutoScroll_SRCS falkon_autoscroll_qt )
+
 set( AutoScroll_UIS
 	autoscrollsettings.ui
 	)
diff --git a/src/plugins/AutoScroll/Messages.sh b/src/plugins/AutoScroll/Messages.sh
new file mode 100644
index 000000000..2b999bd31
--- /dev/null
+++ b/src/plugins/AutoScroll/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_autoscroll_qt.pot
diff --git a/src/plugins/FlashCookieManager/CMakeLists.txt b/src/plugins/FlashCookieManager/CMakeLists.txt
index 3471a72f3..e39f31c62 100644
--- a/src/plugins/FlashCookieManager/CMakeLists.txt
+++ b/src/plugins/FlashCookieManager/CMakeLists.txt
@@ -4,6 +4,8 @@ set( FlashCookieManager_SRCS
 	fcm_notification.cpp
 	)
 
+ecm_create_qm_loader( FlashCookieManager_SRCS falkon_flashcookiemanager_qt )
+
 set( FlashCookieManager_UIS
 	fcm_dialog.ui
 	fcm_notification.ui
diff --git a/src/plugins/FlashCookieManager/Messages.sh b/src/plugins/FlashCookieManager/Messages.sh
new file mode 100644
index 000000000..9b324ea0f
--- /dev/null
+++ b/src/plugins/FlashCookieManager/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_flashcookiemanager_qt.pot
diff --git a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
index 57c15a69e..6dd837c29 100644
--- a/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
+++ b/src/plugins/GnomeKeyringPasswords/CMakeLists.txt
@@ -5,6 +5,8 @@ set( GnomeKeyringPasswords_SRCS
 	gnomekeyringpasswordbackend.cpp
 	)
 
+ecm_create_qm_loader( GnomeKeyringPasswords_SRCS falkon_gnomekeyringpasswords_qt )
+
 set( GnomeKeyringPasswords_RSCS
 	gnomekeyringpasswords.qrc
 	)
diff --git a/src/plugins/GnomeKeyringPasswords/Messages.sh b/src/plugins/GnomeKeyringPasswords/Messages.sh
new file mode 100644
index 000000000..75d450c90
--- /dev/null
+++ b/src/plugins/GnomeKeyringPasswords/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_gnomekeyringpasswords_qt.pot
diff --git a/src/plugins/GreaseMonkey/CMakeLists.txt b/src/plugins/GreaseMonkey/CMakeLists.txt
index 15a7bfd6f..a945ed608 100644
--- a/src/plugins/GreaseMonkey/CMakeLists.txt
+++ b/src/plugins/GreaseMonkey/CMakeLists.txt
@@ -15,6 +15,8 @@ set( GreaseMonkey_SRCS
 	settings/gm_settingslistwidget.cpp
 	)
 
+ecm_create_qm_loader( GreaseMonkey_SRCS falkon_greasemonkey_qt )
+
 set( GreaseMonkey_UIS
 	gm_addscriptdialog.ui
 	gm_notification.ui
diff --git a/src/plugins/GreaseMonkey/Messages.sh b/src/plugins/GreaseMonkey/Messages.sh
new file mode 100644
index 000000000..e18ac2d06
--- /dev/null
+++ b/src/plugins/GreaseMonkey/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_greasemonkey_qt.pot
diff --git a/src/plugins/ImageFinder/CMakeLists.txt b/src/plugins/ImageFinder/CMakeLists.txt
index 00be676ae..1950663ca 100644
--- a/src/plugins/ImageFinder/CMakeLists.txt
+++ b/src/plugins/ImageFinder/CMakeLists.txt
@@ -4,6 +4,8 @@ set( ImageFinder_SRCS
 	imagefindersettings.cpp
 	)
 
+ecm_create_qm_loader( ImageFinder_SRCS falkon_imagefinder_qt )
+
 set( ImageFinder_UIS
 	imagefindersettings.ui
 	)
diff --git a/src/plugins/ImageFinder/Messages.sh b/src/plugins/ImageFinder/Messages.sh
new file mode 100644
index 000000000..666deac56
--- /dev/null
+++ b/src/plugins/ImageFinder/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_imagefinder_qt.pot
diff --git a/src/plugins/KWalletPasswords/CMakeLists.txt b/src/plugins/KWalletPasswords/CMakeLists.txt
index 9ec07c77d..6b3bba20f 100644
--- a/src/plugins/KWalletPasswords/CMakeLists.txt
+++ b/src/plugins/KWalletPasswords/CMakeLists.txt
@@ -3,6 +3,8 @@ set( KWalletPasswords_SRCS
 	kwalletpasswordbackend.cpp
 	)
 
+ecm_create_qm_loader( KWalletPasswords_SRCS falkon_kwalletpasswords_qt )
+
 set( KWalletPasswords_RSCS
 	kwalletpasswords.qrc
 	)
diff --git a/src/plugins/KWalletPasswords/Messages.sh b/src/plugins/KWalletPasswords/Messages.sh
new file mode 100644
index 000000000..512d732f1
--- /dev/null
+++ b/src/plugins/KWalletPasswords/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_kwalletpasswords_qt.pot
diff --git a/src/plugins/MouseGestures/CMakeLists.txt b/src/plugins/MouseGestures/CMakeLists.txt
index f51b4b410..7d7caf4a8 100644
--- a/src/plugins/MouseGestures/CMakeLists.txt
+++ b/src/plugins/MouseGestures/CMakeLists.txt
@@ -14,6 +14,8 @@ set( MouseGestures_SRCS
 	mousegesturessettingsdialog.cpp
 	)
 
+ecm_create_qm_loader( MouseGestures_SRCS falkon_mousegestures_qt )
+
 set( MouseGestures_UIS
 	mousegesturessettingsdialog.ui
 	)
diff --git a/src/plugins/MouseGestures/Messages.sh b/src/plugins/MouseGestures/Messages.sh
new file mode 100644
index 000000000..500269f32
--- /dev/null
+++ b/src/plugins/MouseGestures/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_mousegestures_qt.pot
diff --git a/src/plugins/PIM/CMakeLists.txt b/src/plugins/PIM/CMakeLists.txt
index 79ac0a452..8bebe5eca 100644
--- a/src/plugins/PIM/CMakeLists.txt
+++ b/src/plugins/PIM/CMakeLists.txt
@@ -4,6 +4,8 @@ set( PIM_SRCS
 	PIM_settings.cpp
 	)
 
+ecm_create_qm_loader( PIM_SRCS falkon_pim_qt )
+
 set( PIM_UIS
 	PIM_settings.ui
 	)
diff --git a/src/plugins/PIM/Messages.sh b/src/plugins/PIM/Messages.sh
new file mode 100644
index 000000000..1101ee488
--- /dev/null
+++ b/src/plugins/PIM/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_pim_qt.pot
diff --git a/src/plugins/StatusBarIcons/CMakeLists.txt b/src/plugins/StatusBarIcons/CMakeLists.txt
index 555900d06..552d81265 100644
--- a/src/plugins/StatusBarIcons/CMakeLists.txt
+++ b/src/plugins/StatusBarIcons/CMakeLists.txt
@@ -13,6 +13,8 @@ set( StatusBarIcons_SRCS
 	sbi_zoomwidget.cpp
 	)
 
+ecm_create_qm_loader( StatusBarIcons_SRCS falkon_statusbaricons_qt )
+
 set( StatusBarIcons_UIS
 	sbi_proxywidget.ui
 	sbi_networkicondialog.ui
diff --git a/src/plugins/StatusBarIcons/Messages.sh b/src/plugins/StatusBarIcons/Messages.sh
new file mode 100644
index 000000000..7981bf618
--- /dev/null
+++ b/src/plugins/StatusBarIcons/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_statusbaricons_qt.pot
diff --git a/src/plugins/TabManager/CMakeLists.txt b/src/plugins/TabManager/CMakeLists.txt
index af2a56e2c..d3beae177 100644
--- a/src/plugins/TabManager/CMakeLists.txt
+++ b/src/plugins/TabManager/CMakeLists.txt
@@ -7,6 +7,8 @@ set( TabManager_SRCS
 	tldextractor/tldextractor.cpp
 	)
 
+ecm_create_qm_loader( TabManager_SRCS falkon_tabmanager_qt )
+
 set( TabManager_UIS
 	tabmanagerwidget.ui
 	tabmanagersettings.ui
diff --git a/src/plugins/TabManager/Messages.sh b/src/plugins/TabManager/Messages.sh
new file mode 100644
index 000000000..282658745
--- /dev/null
+++ b/src/plugins/TabManager/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_tabmanager_qt.pot
diff --git a/src/plugins/TestPlugin/CMakeLists.txt b/src/plugins/TestPlugin/CMakeLists.txt
index e50ff933c..9b107dc2b 100644
--- a/src/plugins/TestPlugin/CMakeLists.txt
+++ b/src/plugins/TestPlugin/CMakeLists.txt
@@ -9,6 +9,8 @@ set( TestPlugin_RSCS
 )
 qt5_add_resources(RSCS ${TestPlugin_RSCS})
 
+ecm_create_qm_loader( TestPlugin_SRCS falkon_testplugin_qt )
+
 add_library(TestPlugin MODULE ${TestPlugin_SRCS} ${RSCS})
 install(TARGETS TestPlugin DESTINATION ${FALKON_INSTALL_PLUGINDIR})
 target_link_libraries(TestPlugin FalkonPrivate)
diff --git a/src/plugins/TestPlugin/Messages.sh b/src/plugins/TestPlugin/Messages.sh
new file mode 100644
index 000000000..35ba0d260
--- /dev/null
+++ b/src/plugins/TestPlugin/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_testplugin_qt.pot
diff --git a/src/plugins/VerticalTabs/CMakeLists.txt b/src/plugins/VerticalTabs/CMakeLists.txt
index d5cafda1f..943973472 100644
--- a/src/plugins/VerticalTabs/CMakeLists.txt
+++ b/src/plugins/VerticalTabs/CMakeLists.txt
@@ -12,6 +12,8 @@ set( VerticalTabs_SRCS
     verticaltabsschemehandler.cpp
 )
 
+ecm_create_qm_loader( VerticalTabs_SRCS falkon_verticaltabs_qt )
+
 set( VerticalTabs_UIS
     verticaltabssettings.ui
 )
diff --git a/src/plugins/VerticalTabs/Messages.sh b/src/plugins/VerticalTabs/Messages.sh
new file mode 100644
index 000000000..34e0f4c3c
--- /dev/null
+++ b/src/plugins/VerticalTabs/Messages.sh
@@ -0,0 +1,2 @@
+#! /bin/sh
+$EXTRACT_TR_STRINGS `find . -name '*.cpp' -o -name '*.h' -o -name '*.ui'` -o $podir/falkon_verticaltabs_qt.pot