diff --git a/Makefile b/Makefile
index 6594815..6961f21 100644
--- a/Makefile
+++ b/Makefile
@@ -60,9 +60,9 @@ install:
 .PHONY: build install
 
 ## PyInstaller
-installer_mac: all
+installer_mac:
 	$(PYTHON) -m PyInstaller -n "RevPi Commander" \
-		--add-data="src/$(PACKAGE)/locale:locale" \
+		--add-data="src/$(PACKAGE)/locale:./revpicommander/locale" \
 		--add-data="data/$(PACKAGE).icns:." \
 		--icon=data/$(PACKAGE).icns \
 		--noconfirm \
@@ -78,6 +78,6 @@ installer_win: all
 
 ## Clean
 clean:
-	rm -rf build dist src/*.egg-info src/$(PACKAGE)/ui/[^__]*.py *.spec
+	rm -rf build dist src/*.egg-info *.spec
 
 .PHONY: clean
diff --git a/src/revpicommander/revpicommander.py b/src/revpicommander/revpicommander.py
index fb25f5b..c6496d9 100644
--- a/src/revpicommander/revpicommander.py
+++ b/src/revpicommander/revpicommander.py
@@ -487,10 +487,11 @@ def main() -> int:
 
     try:
         # Setup translation from file with system language
-        locale = QtCore.QLocale.system().name()
         translator = QtCore.QTranslator()
-        locale_file_name = "revpicommander_{0}".format(locale)
-        translator.load(join(dirname(__file__), "locale", locale_file_name), suffix=".qm")
+        translator.load(
+            QtCore.QLocale.system(),
+            "revpicommander", "_", join(dirname(__file__), "locale"), ".qm"
+        )
         app.installTranslator(translator)
     except Exception:
         pass