diff --git a/Makefile b/Makefile
index 7eeebbb615ccff5ff6d7c653abd588e9dd10428e..8c62cb6ef5e94a087598b410bcd047a27ae4f5b8 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,6 @@ install:
 		cp "$$f" "$(DESTDIR)$(PREFIX)/share/gajim/$$DST/"; \
 	done
 	cp COPYING "$(DESTDIR)$(PREFIX)/share/gajim/";
-	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/"; \
diff --git a/scripts/gajim b/scripts/gajim
index 12bf99676f7a7e3a43eea977d217dc979efce81e..a120fa570beb6f28f5a8845410ad89bbe1ac86bc 100644
--- a/scripts/gajim
+++ b/scripts/gajim
@@ -22,6 +22,6 @@ if [ `id -u` -eq 0 ]; then
 	exit 0
 fi
 
-cd PREFIX/share/gajim
+cd PREFIX/share/gajim/src
 export PYTHONPATH="$PYTHONPATH:PREFIX/lib/gajim"
-python gajim.py
+python -OO gajim.pyo