diff -ur a/data/Makefile.am b/data/Makefile.am
--- a/data/Makefile.am	2009-11-04 01:52:39.000000000 +0800
+++ b/data/Makefile.am	2009-11-04 05:54:24.000000000 +0800
@@ -5,7 +5,7 @@
 desktop_in_files = gajim.desktop.in.in 
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
-installdefsdir = $(pkgdatadir)/src/common
+installdefsdir = $(pkglibdir)/common
 installdefs_DATA = defs.py
 
 soundsdir = $(pkgdatadir)/data/sounds
diff -ur a/scripts/gajim.in b/scripts/gajim.in
--- a/scripts/gajim.in	2009-11-04 01:52:39.000000000 +0800
+++ b/scripts/gajim.in	2009-11-04 05:54:24.000000000 +0800
@@ -32,6 +32,6 @@
 export datadir=@DATADIR@/gajim
 PYTHON_EXEC=@PYTHON@
 
-cd ${datadir}/src
+cd @LIBDIR@/gajim
 export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim"
 exec ${PYTHON_EXEC} -OO $APP.py "$@"
diff -ur a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am	2009-11-04 01:52:39.000000000 +0800
+++ b/src/Makefile.am	2009-11-04 06:03:09.000000000 +0800
@@ -26,26 +26,26 @@
 		    --override $(srcdir)/trayicon.override \
 		    $(srcdir)/trayicon.defs > $@
 endif
-gajimsrcdir = $(pkgdatadir)/src
+gajimsrcdir = $(pkglibdir)
 gajimsrc_PYTHON = $(srcdir)/*.py
 
-gajimsrc1dir = $(pkgdatadir)/src/common
+gajimsrc1dir = $(pkglibdir)/common
 gajimsrc1_PYTHON = \
 				$(srcdir)/common/*.py
 
-gajimsrc2dir = $(pkgdatadir)/src/common/xmpp
+gajimsrc2dir = $(pkglibdir)/common/xmpp
 gajimsrc2_PYTHON = \
 				$(srcdir)/common/xmpp/*.py
 
-gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf
+gajimsrc3dir = $(pkglibdir)/common/zeroconf
 gajimsrc3_PYTHON = \
 				$(srcdir)/common/zeroconf/*.py
 
-gajimsrc4dir = $(pkgdatadir)/src/command_system
+gajimsrc4dir = $(pkglibdir)/command_system
 gajimsrc4_PYTHON = \
 				   $(srcdir)/command_system/*.py
 
-gajimsrc5dir = $(pkgdatadir)/src/command_system/implementation
+gajimsrc5dir = $(pkglibdir)/command_system/implementation
 gajimsrc5_PYTHON = \
 				   $(srcdir)/command_system/implementation/*.py