diff --git a/data/locale/Makefile.am b/data/locale/Makefile.am
index dde025d60..c45acb32c 100644
--- a/data/locale/Makefile.am
+++ b/data/locale/Makefile.am
@@ -21,28 +21,34 @@ install_DATA = \
 
 if MAINTAINER_MODE
 
-locals: locals.h locals_intern.h
+locals: sort-locals locals.h locals_intern.h install-locals
 
-ordercheck: deutsch.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq > /tmp/log
-	cut -d' ' -f1 deutsch.locale | uniq  | diff - /tmp/log || \
+sort-locals: $(top_srcdir)/data/locale/deutsch.locale $(top_srcdir)/data/locale/english.locale
+	cat $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > deutsch.locale
+	cat $(top_srcdir)/data/locale/english.locale | LC_ALL=C sort | uniq > english.locale
+
+ordercheck: $(top_srcdir)/data/locale/deutsch.locale
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq > /tmp/log
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | uniq  | diff - /tmp/log || \
 		(echo "ERROR: deutsch.locale not ordered or contains empty lines" && false)
 
-locals.h: ordercheck deutsch.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | ./create.locals.h
+locals.h: ordercheck $(top_srcdir)/data/locale/deutsch.locale
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq | tr [:lower:] [:upper:] | tr \. \_  | tr \- \_ | tr -d \? | $(top_srcdir)/data/locale/create.locals.h
 
-locals_intern.h: ordercheck deutsch.locale
-	cut -d' ' -f1 deutsch.locale | LC_ALL=C sort | uniq | ./create.locals_intern.h
+locals_intern.h: ordercheck $(top_srcdir)/data/locale/deutsch.locale
+	cut -d' ' -f1 $(top_srcdir)/data/locale/deutsch.locale | LC_ALL=C sort | uniq | $(top_srcdir)/data/locale/create.locals_intern.h
 
 check: locals.h locals_intern.h
-	diff locals.h ../../src/system
-	diff locals_intern.h ../../src/system
+	diff locals.h $(top_srcdir)/src/system
+	diff locals_intern.h $(top_srcdir)/src/system
 
 install-locals: locals.h locals_intern.h
-	cp locals.h locals_intern.h ../../src/system
-	@echo "Consider committing .../neutrino/src/system/[locals.h,locals_intern.h]"
+	cp locals.h locals_intern.h $(top_srcdir)/src/system
+	@echo "Consider committing src/system/[locals.h,locals_intern.h]"
+	cp -f deutsch.locale english.locale $(top_srcdir)/data/locale
+	@echo "Consider committing data/locale/[deutsch.locale,english.locale]"
 
 locals-clean:
-	rm -f locals.h locals_intern.h
+	rm -f locals.h locals_intern.h deutsch.locale english.locale
 
 endif
diff --git a/data/locale/_readme.txt b/data/locale/_readme.txt
index 97044e9d4..cd4366866 100644
--- a/data/locale/_readme.txt
+++ b/data/locale/_readme.txt
@@ -28,36 +28,35 @@ How do I add a new locale string?
 ---------------------------------
 1.)
 First of all, add the new string to deutsch.locale while preserving
-the ordering. Do not add any empty lines. Use `make ordercheck' to for
-verification.
+the ordering. Do not add any empty lines.
 
 2.)
-Enter the directory apps/tuxbox/neutrino/data/locale.
+Enter the directory build_tmp/neutrino-hd/data/locale.
 
 3.)
-Create new versions of the files apps/tuxbox/neutrino/src/system/locals.h
-and apps/tuxbox/neutrino/src/system/locals_intern.h
-using the command `make locals.h locals_intern.h'.
+Use for sorting (deutsch.locale,english.locale) 'make sort-locals', use 'make ordercheck' to for
+verification.
 
 4.)
-Check the modifications with `make check', or with
-diff locals.h ../../src/system/locals.h
-diff locals_intern.h ../../src/system/locals_intern.h
+Create new versions of the files src/system/locals.h and src/system/locals_intern.h
+using the command 'make locals.h locals_intern.h'.
 
 5.)
-Copy the replacement file to their destination with `make install-locals',
-or with
-cp -p locals.h ../../src/system/locals.h
-cp -p locals_intern.h ../../src/system/locals_intern.h
+Check the modifications with 'make check'
 
 6.)
+Copy the replacement file to their destination with 'make install-locals'
+
+7.)
+Or use for item 3-6 'make locals'
+
+8.)
 To the extent possible, update other locale file. For this, the
 Perl-script create-locals-update.pl may be useful. 
 
-7.)
-If committing the changes to CVS, commit both the involved
-locale-files, apps/tuxbox/neutrino/src/system/locals.h, and
-as apps/tuxbox/neutrino/src/system/locals_intern.h.
+9.)
+If committing the changes to Git, commit both the involved
+locale-files, src/system/locals.h, and src/system/locals_intern.h.
 
 Useful tools:
 -------------