diff --git a/.gitignore b/.gitignore
index 5e32468bd05f0ece300338bf99f9ff60f1e7faf4..c8a2d870d7852a01ea461cc5b9e7657736ba3740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.tx
 pkgbuild
 resources/*.c
 src/pamac-daemon
diff --git a/files_to_translate b/files_to_translate
deleted file mode 100644
index d1e66c14ab7632737f93df065347073e5c13ec2c..0000000000000000000000000000000000000000
--- a/files_to_translate
+++ /dev/null
@@ -1,26 +0,0 @@
-resources/choose_provider_dialog.ui
-resources/packages_chooser_dialog.ui
-resources/progress_dialog.ui
-resources/history_dialog.ui
-resources/transaction_info_dialog.ui
-resources/transaction_sum_dialog.ui
-resources/manager_window.ui
-resources/updater_window.ui
-resources/preferences_dialog.ui
-
-src/packages_chooser_dialog.vala
-src/transaction_info_dialog.vala
-src/history_dialog.vala
-src/transaction_sum_dialog.vala
-src/daemon.vala
-src/transaction.vala
-src/installer.vala
-src/tray.vala
-src/manager.vala
-src/preferences_dialog.vala
-src/updater.vala
-src/choose_provider_dialog.vala
-src/manager_window.vala
-src/progress_dialog.vala
-src/updater_window.vala
-src/common.vala
diff --git a/create_pot_file.sh b/po/create_pot_file.sh
similarity index 100%
rename from create_pot_file.sh
rename to po/create_pot_file.sh
diff --git a/po/files_to_translate b/po/files_to_translate
new file mode 100644
index 0000000000000000000000000000000000000000..e5c189bfe1a60115f9d54280cf6e94a78a957af7
--- /dev/null
+++ b/po/files_to_translate
@@ -0,0 +1,26 @@
+../resources/choose_provider_dialog.ui
+../resources/packages_chooser_dialog.ui
+../resources/progress_dialog.ui
+../resources/history_dialog.ui
+../resources/transaction_info_dialog.ui
+../resources/transaction_sum_dialog.ui
+../resources/manager_window.ui
+../resources/updater_window.ui
+../resources/preferences_dialog.ui
+
+../src/packages_chooser_dialog.vala
+../src/transaction_info_dialog.vala
+../src/history_dialog.vala
+../src/transaction_sum_dialog.vala
+../src/daemon.vala
+../src/transaction.vala
+../src/installer.vala
+../src/tray.vala
+../src/manager.vala
+../src/preferences_dialog.vala
+../src/updater.vala
+../src/choose_provider_dialog.vala
+../src/manager_window.vala
+../src/progress_dialog.vala
+../src/updater_window.vala
+../src/common.vala
diff --git a/pamac.pot b/po/pamac.pot
similarity index 100%
rename from pamac.pot
rename to po/pamac.pot
diff --git a/pot_head b/po/pot_head
similarity index 100%
rename from pot_head
rename to po/pot_head
diff --git a/update_po_files.sh b/po/update_po_files.sh
similarity index 59%
rename from update_po_files.sh
rename to po/update_po_files.sh
index 0ce20b2ca01d6255f12928cdc72497e658d40292..06f30dadd638db14031028aa2bc700317d527185 100755
--- a/update_po_files.sh
+++ b/po/update_po_files.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
 
 for i in `ls po | sed s'|.po||'` ; do
-	msgmerge --update po/$i.po pamac.pot
+	msgmerge --update ./$i.po pamac.pot
 done