diff --git a/lang/Makefile b/lang/Makefile
index 5879ff3..47c1eb4 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,9 +1,9 @@
 INSTALLDIR = $(shell pwd)
 LANGUAGES = `find ./ -name "stripe_*.po" -print | sed 's|^\./stripe_\(.*\).po|\1|'`
 DOMAINS = stripe
-PHP_SOURCES = $(shell find ../ -maxdepth 1 -name \*.php) \
-              $(shell find ../lib/GaletteStripe/ -name \*.php) \
-              $(shell find ../tempcache -name \*.twig)
+PHP_SOURCES = $(sort $(shell find ../ -maxdepth 1 -name \*.php)) \
+              $(sort $(shell find ../lib/GaletteStripe/ -name \*.php)) \
+              $(sort $(shell find ../tempcache -name \*.twig))
 
 all : extract mo
 
@@ -32,5 +32,5 @@ extract : twig ${PHP_SOURCES} Makefile
 	cd ../../../../ && bin/console galette:twig-pot-references $(CURDIR)/${DOMAINS}.pot $(shell basename $(abspath $(CURDIR)/..))
 	echo "Generating en_US:"
 	@for d in ${DOMAINS}; do \
-	  LANG=C msginit --no-translator -i $$d.pot --locale=en_US.utf8 -o $${d}_en_US.po; \
+	  sed 's/charset=CHARSET/charset=UTF-8/' $$d.pot | LANG=C msginit --no-translator -i - --locale=en_US.utf8 -o $${d}_en_US.po; \
 	done