31 files changed, 14 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index e471371c5..0a4a83fe0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,8 +53,8 @@ freeipa2-dev-doc
 /daemons/ipa-version.h
 /daemons/test-driver
 
-/install/po/test.po
-/install/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
+/po/test.po
+/po/test_locale/xh_ZA/LC_MESSAGES/ipa.mo
 !/install/ui/doc/Makefile.in
 /install/ui/release
 /install/ui/css/ipa.css
diff --git a/Makefile b/Makefile
index cf85ac76b..280cc7f6b 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ client-install: client client-dirs
 	@for subdir in $(CLIENTDIRS); do \
 		(cd $$subdir && $(MAKE) install) || exit 1; \
 	done
-	cd install/po && $(MAKE) install || exit 1;
+	cd po && $(MAKE) install || exit 1;
 	@for subdir in $(CLIENTPYDIRS); do \
 		if [ "$(DESTDIR)" = "" ]; then \
 			(cd $$subdir && $(PYTHON) setup.py install); \
@@ -146,7 +146,7 @@ pylint: bootstrap-autogen
 	PYTHONPATH=. pylint --rcfile=pylintrc $(PYLINTFLAGS) $$FILES || $(LINT_IGNORE_FAIL)
 
 po-validate:
-	$(MAKE) -C install/po validate-src-strings || $(LINT_IGNORE_FAIL)
+	$(MAKE) -C po validate-src-strings || $(LINT_IGNORE_FAIL)
 
 jslint:
 	cd install/ui; jsl -nologo -nosummary -nofilelisting -conf jsl.conf || $(LINT_IGNORE_FAIL)
diff --git a/configure.ac b/configure.ac
index d4ea256ec..82dd150e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -368,11 +368,11 @@ AC_CONFIG_FILES([
     install/tools/Makefile
     install/tools/man/Makefile
     install/updates/Makefile
-    install/po/Makefile
     install/restart_scripts/Makefile
     install/wsgi/Makefile
     install/oddjob/Makefile
     ipatests/man/Makefile
+    po/Makefile
     util/Makefile
 ])
 
diff --git a/install/Makefile.am b/install/Makefile.am
index d13ecb701..c56d7265e 100644
--- a/install/Makefile.am
+++ b/install/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS =			\
         ui			\
         tools			\
         updates			\
-        po			\
         restart_scripts		\
         wsgi			\
         oddjob			\
diff --git a/ipatests/i18n.py b/ipatests/i18n.py
index 64e078fa8..1f48e65bb 100755
--- a/ipatests/i18n.py
+++ b/ipatests/i18n.py
@@ -22,7 +22,7 @@
 from __future__ import print_function
 
 # WARNING: Do not import ipa modules, this is also used as a
-# stand-alone script (invoked from install/po Makefile).
+# stand-alone script (invoked from po Makefile).
 import optparse
 import sys
 import gettext
diff --git a/install/po/LINGUAS b/po/LINGUAS
index 5f8fc6341..5f8fc6341 100644
--- a/install/po/LINGUAS
+++ b/po/LINGUAS
diff --git a/install/po/Makefile.in b/po/Makefile.in
index 6ab26dacc..7db76becd 100644
--- a/install/po/Makefile.in
+++ b/po/Makefile.in
@@ -16,7 +16,7 @@ MSGMERGE = @MSGMERGE@
 MSGCMP = @MSGCMP@
 MSGATTRIB = @MSGATTRIB@
 TX = @TX@
-IPA_TEST_I18N = ../../ipatests/i18n.py
+IPA_TEST_I18N = ../ipatests/i18n.py
 
 DOMAIN = @GETTEXT_DOMAIN@
 MSGMERGE_UPDATE = $(MSGMERGE) --update
@@ -36,9 +36,9 @@ po_files = $(patsubst %, %.po, $(languages))
 mo_files = $(patsubst %.po, %.mo, $(po_files))
 po_count=$(words $(po_files))
 
-PY_FILES = $(shell cd ../..; git ls-files | grep -v -e "^ipatests/" -e "^doc/" -e "^install/po/" -e "^ipapython/test/" -e "setup.py" | grep "\.py$$" | tr '\n' ' '; cd install/po)
-C_FILES = $(shell cd ../..; git ls-files | grep "\.c$$" | tr '\n' ' '; cd install/po)
-H_FILES = $(shell cd ../..; git ls-files | grep "\.h$$" | tr '\n' ' '; cd install/po)
+PY_FILES = $(shell cd ..; git ls-files | grep -v -e "^ipatests/" -e "^doc/" -e "^po/" -e "^ipapython/test/" -e "setup.py" | grep "\.py$$" | tr '\n' ' '; cd po)
+C_FILES = $(shell cd ..; git ls-files | grep "\.c$$" | tr '\n' ' '; cd po)
+H_FILES = $(shell cd ..; git ls-files | grep "\.h$$" | tr '\n' ' '; cd po)
 
 # Please keep this list sorted!
 PY_EXPLICIT_FILES = \
@@ -122,7 +122,7 @@ create-po: $(DOMAIN).pot
 
 
 pull-po:
-	cd ../..; $(TX) pull -f
+	cd ..; $(TX) pull -f
 	$(MAKE) strip-po
 
 merge-po: update-pot
@@ -133,14 +133,14 @@ update-po: merge-po
 
 update-pot:
 	@rm -f $(DOMAIN).pot.update
-	@pushd ../.. ; \
+	@pushd .. ; \
 	$(XGETTEXT) $(XGETTEXT_OPTIONS) \
-	--output install/po/$(DOMAIN).pot.update \
+	--output po/$(DOMAIN).pot.update \
 	--language="python" \
 	$(PYTHON_POTFILES) \
 	&& \
 	$(XGETTEXT) $(XGETTEXT_OPTIONS) \
-	--output install/po/$(DOMAIN).pot.update \
+	--output po/$(DOMAIN).pot.update \
 	--join-existing \
 	--language="c" \
 	--from-code="UTF-8" \
diff --git a/install/po/README b/po/README
index 6894a0633..6894a0633 100644
--- a/install/po/README
+++ b/po/README
diff --git a/install/po/bn_IN.po b/po/bn_IN.po
index 727c0e1c1..727c0e1c1 100644
--- a/install/po/bn_IN.po
+++ b/po/bn_IN.po
diff --git a/install/po/ca.po b/po/ca.po
index c4feabc87..c4feabc87 100644
--- a/install/po/ca.po
+++ b/po/ca.po
diff --git a/install/po/contributing_translators.txt b/po/contributing_translators.txt
index c10906568..c10906568 100644
--- a/install/po/contributing_translators.txt
+++ b/po/contributing_translators.txt
diff --git a/install/po/cs.po b/po/cs.po
index 8f16e6bfa..8f16e6bfa 100644
--- a/install/po/cs.po
+++ b/po/cs.po
diff --git a/install/po/de.po b/po/de.po
index 15bf41829..15bf41829 100644
--- a/install/po/de.po
+++ b/po/de.po
diff --git a/install/po/es.po b/po/es.po
index 24a30729d..24a30729d 100644
--- a/install/po/es.po
+++ b/po/es.po
diff --git a/install/po/eu.po b/po/eu.po
index 63abf4bde..63abf4bde 100644
--- a/install/po/eu.po
+++ b/po/eu.po
diff --git a/install/po/fr.po b/po/fr.po
index 5469456f8..5469456f8 100644
--- a/install/po/fr.po
+++ b/po/fr.po
diff --git a/install/po/hi.po b/po/hi.po
index f87ad73b3..f87ad73b3 100644
--- a/install/po/hi.po
+++ b/po/hi.po
diff --git a/install/po/hu.po b/po/hu.po
index 03d2ff284..03d2ff284 100644
--- a/install/po/hu.po
+++ b/po/hu.po
diff --git a/install/po/id.po b/po/id.po
index b94a81c17..b94a81c17 100644
--- a/install/po/id.po
+++ b/po/id.po
diff --git a/install/po/ipa.pot b/po/ipa.pot
index 145a5f2df..145a5f2df 100644
--- a/install/po/ipa.pot
+++ b/po/ipa.pot
diff --git a/install/po/ja.po b/po/ja.po
index 99bc1b2b2..99bc1b2b2 100644
--- a/install/po/ja.po
+++ b/po/ja.po
diff --git a/install/po/kn.po b/po/kn.po
index 104cc4027..104cc4027 100644
--- a/install/po/kn.po
+++ b/po/kn.po
diff --git a/install/po/mr.po b/po/mr.po
index 4fab87769..4fab87769 100644
--- a/install/po/mr.po
+++ b/po/mr.po
diff --git a/install/po/nl.po b/po/nl.po
index dae37e722..dae37e722 100644
--- a/install/po/nl.po
+++ b/po/nl.po
diff --git a/install/po/pl.po b/po/pl.po
index 8b3106e93..8b3106e93 100644
--- a/install/po/pl.po
+++ b/po/pl.po
diff --git a/install/po/pt_BR.po b/po/pt_BR.po
index b4e192657..b4e192657 100644
--- a/install/po/pt_BR.po
+++ b/po/pt_BR.po
diff --git a/install/po/ru.po b/po/ru.po
index c0ae5a01d..c0ae5a01d 100644
--- a/install/po/ru.po
+++ b/po/ru.po
diff --git a/install/po/sk.po b/po/sk.po
index 608e7a9aa..608e7a9aa 100644
--- a/install/po/sk.po
+++ b/po/sk.po
diff --git a/install/po/tg.po b/po/tg.po
index f71a3a5fb..f71a3a5fb 100644
--- a/install/po/tg.po
+++ b/po/tg.po
diff --git a/install/po/uk.po b/po/uk.po
index f3b02b1c9..f3b02b1c9 100644
--- a/install/po/uk.po
+++ b/po/uk.po
diff --git a/install/po/zh_CN.po b/po/zh_CN.po
index 138495168..138495168 100644
--- a/install/po/zh_CN.po
+++ b/po/zh_CN.po