diff --git a/src/i18n/Makefile b/src/i18n/Makefile
index e94f4421..82b092c3 100644
--- a/src/i18n/Makefile
+++ b/src/i18n/Makefile
@@ -3,6 +3,7 @@ PROJECT := "Spreed Speak Freely"
 COPYRIGHT := "struktur AG"
 EMAIL := "simon@struktur.de"
 ROOT := "$(CURDIR)/../.."
+LANGUAGES := $(shell find ./ -iname '*.po' -printf '%f\n' | sed 's/\.po$$//' | sed 's/\messages-//')
 
 # Tools
 NODEJS := nodejs
@@ -11,7 +12,9 @@ NODE_PATH := /usr/local/lib/node_modules:/usr/lib/node_modules
 PYTHON := python
 
 build: update
-	NODE_PATH=$(NODE_PATH) $(NODEJS) helpers/po2json messages-de.po $(ROOT)/static/translation/messages-de.json
+	for lang in $(LANGUAGES) ; do \
+		NODE_PATH=$(NODE_PATH) $(NODEJS) helpers/po2json messages-$$lang.po $(ROOT)/static/translation/messages-$$lang.json ; \
+	done
 	$(PYTHON) helpers/languages.py >$(ROOT)/static/translation/languages.js
 
 extract:
@@ -28,4 +31,7 @@ extract:
 		$(ROOT)/static/js/services
 
 update:
-	$(PYBABEL) update -l de -i messages.pot -o messages-de.po
+	for lang in $(LANGUAGES) ; do \
+		$(PYBABEL) update -l $$lang -i messages.pot -o messages-$$lang.po ; \
+	done
+