diff --git a/.tx/config b/.tx/config
new file mode 100644
index 000000000..2961116ae
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.net
+
+[subsurface.subsurface]
+file_filter = po/<lang>.po
+source_file = po/subsurface-new.pot
+source_lang = en
+type = PO
diff --git a/Makefile b/Makefile
index a30ef0fa4..71e19f03d 100644
--- a/Makefile
+++ b/Makefile
@@ -259,16 +259,11 @@ $(NSIFILE): $(NSIINPUTFILE)
 $(INFOPLIST): $(INFOPLISTINPUT)
 	$(shell cat $(INFOPLISTINPUT) | sed -e 's/CFBUNDLEVERSION_TOKEN/$(CFBUNDLEVERSION_STRING)/' > $(INFOPLIST))
 
+# Transifex merge the translations
 update-po-files:
 	xgettext -o po/subsurface-new.pot -s -k_ -kN_ --keyword=C_:1c,2  --add-comments="++GETTEXT" *.c
-	for i in po/*.po; do \
-		msgmerge --no-wrap -s -U $$i po/subsurface-new.pot ; \
-	done
-
-prepare-po-files:
-	for i in po/*.po; do \
-		msgcat --no-wrap $$i -o $$i ; \
-	done
+	tx push -s
+	tx pull -af
 
 EXTRA_FLAGS =	$(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
 		$(XSLT) $(ZIP) $(LIBDIVECOMPUTERCFLAGS) \