diff --git a/Makefile b/Makefile
index 9ee558e5b..62dec84e8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,11 @@ MODULES = common plugins/gtkgui
 PREFIX = /usr
 DESTDIR = /
 
-FIND= find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(so\)\|\(mo\)\)'
+FIND= find -regex '.*\.\(\(glade\)\|\(py\)\|\(xpm\)\|\(gif\)\|\(png\)\|\(mo\)\)'
 FILES=`$(FIND)`
 DIRS= `$(FIND) -exec dirname {} \; | sort -u`
+FIND_LIB= find -regex '.*\.\(so\)'
+FILES_LIB=`$(FIND_LIB)`
 
 SCRIPTS = \
 	scripts/gajim
@@ -27,6 +29,11 @@ install:
 		DST=`dirname "$$f"`; \
 		cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
 	done
+	rm "$(DESTDIR)$(PREFIX)/share/gajim/setup_win32.py";
+	mkdir -p "$(DESTDIR)$(PREFIX)/lib/gajim";
+	for f in $(FILES_LIB) ; do \
+		cp "$$f" "$(DESTDIR)$(PREFIX)/lib/gajim/"; \
+	done
 	for s in $(SCRIPTS) ; do \
 		BASE=`basename "$$s"`; \
 		F=`cat "$$s" | sed -e 's!PREFIX!$(PREFIX)!g'`; \
diff --git a/debian/dirs b/debian/dirs
index 397e8e256..3ff5ef76d 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -3,3 +3,4 @@ usr/share/gajim
 usr/share/man/man1
 usr/share/pixmaps
 usr/lib/menu
+usr/lib/gajim
diff --git a/scripts/gajim b/scripts/gajim
index 085fab0ae..5440b2e49 100644
--- a/scripts/gajim
+++ b/scripts/gajim
@@ -22,4 +22,5 @@ if [ `id -u` -eq 0 ]; then
 fi
 
 cd PREFIX/share/gajim
+export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
 python gajim.py