diff --git a/configure.ac b/configure.ac
index 4cd6e5c6a..ad0f14866 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,7 @@ AC_SUBST([PYTHON_INCLUDES])
 AS_AC_EXPAND(DATADIR, "${datadir}")
 AS_AC_EXPAND(LIBDIR, "${libdir}")
 AS_AC_EXPAND(DOCDIR, "${docdir}")
+AS_AC_EXPAND(LOCALEDIR, "${localedir}")
 
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
diff --git a/data/defs.py.in b/data/defs.py.in
index 55af93a75..b59d5b481 100644
--- a/data/defs.py.in
+++ b/data/defs.py.in
@@ -5,3 +5,5 @@ docdir = "@DOCDIR@"
 datadir = "@DATADIR@"
 
 version = "@VERSION@"
+
+localedir = "@LOCALEDIR@"
diff --git a/src/common/defs.py b/src/common/defs.py
index fbee7f3df..654f3bf93 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -25,6 +25,7 @@
 
 docdir = '../'
 datadir = '../'
+localedir = '../po'
 
 version = '0.12.1.2-svn'
 
diff --git a/src/common/i18n.py b/src/common/i18n.py
index 04d45d833..e6e7d3f9b 100644
--- a/src/common/i18n.py
+++ b/src/common/i18n.py
@@ -24,12 +24,10 @@
 import locale
 import gettext
 import os
+import defs
 
 APP = 'gajim'
-if os.path.isdir('../po'):
-	DIR = '../po'
-else:
-	DIR = '../../locale'
+DIR = defs.localedir
 
 # set '' so each part of the locale that should be modified is set
 # according to the environment variables