diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index e30d2e63..37ffdd60 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = C
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/Makefile.am b/nls/Makefile.am
index de6a96bf..c046ed8d 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -1,5 +1,6 @@
 # nls/Makefile.am for fluxbox - http://fluxbox.sf.net
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 SUBDIRS = C cs_CZ da_DK es_ES et_EE fr_FR pt_BR ru_RU \
 		  sv_SE tr_TR it_IT pt_PT bg_BG ja_JP ko_KR \
@@ -11,7 +12,7 @@ BUILT_SOURCES=fluxbox-nls.hh
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls; \
+		rmdir $(DESTDIR)$(LOCALE_PATH); \
 	fi
 distclean-local:
 	rm -f *\~
diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am
index 2aae35dc..5367f96d 100644
--- a/nls/bg_BG/Makefile.am
+++ b/nls/bg_BG/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = bg_BG
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/cs_CZ/Makefile.am b/nls/cs_CZ/Makefile.am
index c6d09994..f81b8056 100644
--- a/nls/cs_CZ/Makefile.am
+++ b/nls/cs_CZ/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = cs_CZ
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index ba75785c..d4738128 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = da_DK
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/de_DE/Makefile.am b/nls/de_DE/Makefile.am
index 5446cddf..035fcd17 100644
--- a/nls/de_DE/Makefile.am
+++ b/nls/de_DE/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = de_DE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index c0d54d1e..d71114f6 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = es_ES
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 79db27a3..0e6f33da 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = et_EE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index 8d516c79..dfb56e1b 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = fr_FR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index 1a19782e..cbae78d6 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = it_IT
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am
index 3444f5c0..733d98b3 100644
--- a/nls/ja_JP/Makefile.am
+++ b/nls/ja_JP/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = ja_JP
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/ko_KR/Makefile.am b/nls/ko_KR/Makefile.am
index 53d53e09..667997b9 100644
--- a/nls/ko_KR/Makefile.am
+++ b/nls/ko_KR/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = ko_KR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/lv_LV/Makefile.am b/nls/lv_LV/Makefile.am
index e3d5a22a..16b90c6e 100644
--- a/nls/lv_LV/Makefile.am
+++ b/nls/lv_LV/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = lv_LV
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/nl_NL/Makefile.am b/nls/nl_NL/Makefile.am
index e2f1f34f..e5110455 100644
--- a/nls/nl_NL/Makefile.am
+++ b/nls/nl_NL/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = nl_NL
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/pl_PL/Makefile.am b/nls/pl_PL/Makefile.am
index 9d4812a6..282267cd 100644
--- a/nls/pl_PL/Makefile.am
+++ b/nls/pl_PL/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = pl_PL
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index a5574b2b..ef7a8f18 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = pt_BR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/pt_PT/Makefile.am b/nls/pt_PT/Makefile.am
index 179c9ef6..f7524636 100644
--- a/nls/pt_PT/Makefile.am
+++ b/nls/pt_PT/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = pt_PT
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index 495c5ed2..2073d101 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = ru_RU
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/sl_SI/Makefile.am b/nls/sl_SI/Makefile.am
index 6b21457f..4fee69e5 100644
--- a/nls/sl_SI/Makefile.am
+++ b/nls/sl_SI/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = sl_SI
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index f97a26f9..3eb32922 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = sv_SE
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index fdc31615..0b24205c 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = tr_TR
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m
diff --git a/nls/vi_VN/Makefile.am b/nls/vi_VN/Makefile.am
index b9721185..131f40a5 100644
--- a/nls/vi_VN/Makefile.am
+++ b/nls/vi_VN/Makefile.am
@@ -2,6 +2,7 @@
 
 THE_LANG = vi_VN
 
+LOCALE_PATH = @LOCALE_PATH@
 NLSTEST = @NLS@
 CLEANFILES = fluxbox.cat
 MAINTAINERCLEANFILES = Makefile.in 
@@ -11,15 +12,15 @@ EXTRA_DIST= $(MFILES)
 all-local: fluxbox.cat
 install-data-local: fluxbox.cat
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \
-		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
-		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		echo "Installing catalog in $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)"; \
+		$(mkinstalldirs) $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
+		$(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 uninstall-local:
 	@if test x$(NLSTEST) = "x-DNLS"; then \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \
-		rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \
+		rm -f $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG)/fluxbox.cat; \
+		rmdir $(DESTDIR)$(LOCALE_PATH)/$(THE_LANG); \
 	fi
 
 fluxbox.cat: Translation.m