diff --git a/Makefile.am b/Makefile.am
index 523bd7ba8bb995ef381670ccef864cefb8a4f494..bf680095be05b44c82bdb14d1f816d3068546865 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data src po
+SUBDIRS = src data po
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.ac b/configure.ac
index d58b2e987de0d976fecfb974c87dd4b262623e09..5def3962a9e371e3217e6e006fa43c63be9ca03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,9 +154,9 @@ AC_CONFIG_FILES([
 	data/pixmaps/Makefile
 	data/iconsets/Makefile
 	data/gajim.desktop.in
+	data/defs.py
 	src/Makefile
 	src/common/Makefile
-	src/common/defs.py
 	scripts/gajim
 	po/Makefile.in
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 1e92a0a329f63de0b400de66ab40f833da36ce01..9d43afdd08801410aac7339424a99248b1f7d888 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,6 +5,9 @@ desktopdir = $(datadir)/applications
 desktop_in_files = gajim.desktop.in.in 
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
+installdefsdir = $(pkgdatadir)/src
+installdefs_DATA = defs.py
+
 soundsdir = $(pkgdatadir)/data/sounds
 sounds_DATA = $(srcdir)/sounds/*.wav
 
@@ -17,10 +20,13 @@ man_MANS = gajim.1 gajim-remote.1
 EXTRA_DIST = $(desktop_in_files) \
 			 $(sounds_DATA) \
 			 $(other_DATA) \
-			 $(man_MANS)
+			 $(man_MANS) \
+			 defs.py.in
+
 
-DISTCLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(desktop_DATA) \
+				 $(installdefs_DATA)
 
-CLEANFILES = gajim.desktop
+CLEANFILES = gajim.desktop 
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/common/defs.py.in b/data/defs.py.in
similarity index 100%
rename from src/common/defs.py.in
rename to data/defs.py.in