diff --git a/setup_win32.py b/setup_win32.py
index 2fad85f3d..c7de3495e 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -20,18 +20,18 @@
 from distutils.core import setup
 import py2exe
 import glob
-import sys
+import sys
 import os
 
-sys.path.append('src')
+sys.path.append('src')
 # Use local gtk folder instead of the one in PATH that is not latest gtk
-if 'gtk' in os.listdir('.'):
+if 'gtk' in os.listdir('.'):
     sys.path.append('gtk/bin')
 includes = ['encodings', 'encodings.utf-8',]
 
 opts = {
     'py2exe': {
-        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1',
+        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*', #',docutils.readers.*,docutils.writers.html4css1',
         'dll_excludes': [
             'iconv.dll','intl.dll','libatk-1.0-0.dll',
             'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
@@ -46,7 +46,7 @@ opts = {
 
 setup(
     name = 'Gajim',
-    version = '0.11.4',
+    version = '0.11.4.4-svn',
     description = 'A full featured Jabber client',
     author = 'Gajim Development Team',
     url = 'http://www.gajim.org/',
diff --git a/src/gajim.py b/src/gajim.py
index 433027893..4e4187442 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -31,17 +31,18 @@ if os.name == 'nt':
 	import warnings
 	warnings.filterwarnings(action='ignore')
 
-# Used to create windows installer with GTK included
-#	paths = os.environ['PATH']
-#	list_ = paths.split(';')
-#	new_list = []
-#	for p in list_:
-#		if p.find('gtk') < 0 and p.find('GTK') < 0:
-#			new_list.append(p)
-#	new_list.insert(0, 'gtk/lib')
-#	new_list.insert(0, 'gtk/bin')
-#	os.environ['PATH'] = ';'.join(new_list)
-#	os.environ['GTK_BASEPATH'] = 'gtk'
+	if os.path.isdir('gtk'):
+		# Used to create windows installer with GTK included
+		paths = os.environ['PATH']
+		list_ = paths.split(';')
+		new_list = []
+		for p in list_:
+			if p.find('gtk') < 0 and p.find('GTK') < 0:
+				new_list.append(p)
+		new_list.insert(0, 'gtk/lib')
+		new_list.insert(0, 'gtk/bin')
+		os.environ['PATH'] = ';'.join(new_list)
+		os.environ['GTK_BASEPATH'] = 'gtk'
 
 import sys
 
diff --git a/src/history_manager.py b/src/history_manager.py
index 3ba50a8cb..406bcfbca 100755
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -28,17 +28,18 @@ if os.name == 'nt':
 	import warnings
 	warnings.filterwarnings(action='ignore')
 
-# Used to create windows installer with GTK included
-#	paths = os.environ['PATH']
-#	list_ = paths.split(';')
-#	new_list = []
-#	for p in list_:
-#		if p.find('gtk') < 0 and p.find('GTK') < 0:
-#			new_list.append(p)
-#	new_list.insert(0, 'gtk/lib')
-#	new_list.insert(0, 'gtk/bin')
-#	os.environ['PATH'] = ';'.join(new_list)
-#	os.environ['GTK_BASEPATH'] = 'gtk'
+	if os.path.isdir('gtk'):
+		# Used to create windows installer with GTK included
+		paths = os.environ['PATH']
+		list_ = paths.split(';')
+		new_list = []
+		for p in list_:
+			if p.find('gtk') < 0 and p.find('GTK') < 0:
+				new_list.append(p)
+		new_list.insert(0, 'gtk/lib')
+		new_list.insert(0, 'gtk/bin')
+		os.environ['PATH'] = ';'.join(new_list)
+		os.environ['GTK_BASEPATH'] = 'gtk'
 
 import sys
 import signal