diff --git a/gajim.nsi b/gajim.nsi
index 518d48ce8c3afc00fe50129d8a9c1d8351758488..25df1453484732751993bb1573e48defa00ff8d5 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -159,20 +159,23 @@ Section "Gajim" SecGajim
 	File "bin\Crypto.Hash.SHA256.pyd"
 	File "bin\Crypto.Random.OSRNG.winrandom.pyd"
 	File "bin\Crypto.Util._counter.pyd"
+	File "bin\Crypto.Util.strxor.pyd"
 	File "bin\gajim.exe"
 	File "bin\gio._gio.pyd"
 	File "bin\glib._glib.pyd"
 	File "bin\gobject._gobject.pyd"
+	File "bin\goocanvas.pyd"
 	File "bin\gtk._gtk.pyd"
 	File "bin\history_manager.exe"
 	File "bin\OpenSSL.crypto.pyd"
 	File "bin\libeay32.dll"
+	File "bin\libgoocanvas-3.dll"
 	File "bin\library.zip"
 	File "bin\pangocairo.pyd"
 	File "bin\pango.pyd"
 	File "bin\pyexpat.pyd"
-	File "bin\python26.dll"
-	File "bin\pywintypes26.dll"
+	File "bin\python27.dll"
+	File "bin\pywintypes27.dll"
 	File "bin\OpenSSL.rand.pyd"
 	File "bin\select.pyd"
 	File "bin\sqlite3.dll"
@@ -660,13 +663,16 @@ Section "Uninstall"
 	Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd"
 	Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd"
 	Delete "$INSTDIR\bin\Crypto.Util._counter.pyd"
+	Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd"
 	Delete "$INSTDIR\bin\gajim.exe"
 	Delete "$INSTDIR\bin\gio._gio.pyd"
 	Delete "$INSTDIR\bin\glib._glib.pyd"
 	Delete "$INSTDIR\bin\gobject._gobject.pyd"
+	Delete "$INSTDIR\bin\goocanvas.pyd"
 	Delete "$INSTDIR\bin\gtk._gtk.pyd"
 	Delete "$INSTDIR\bin\history_manager.exe"
 	Delete "$INSTDIR\bin\libeay32.dll"
+	Delete "$INSTDIR\bin\libgoocanvas-3.dll"
 	Delete "$INSTDIR\bin\library.zip"
 	Delete "$INSTDIR\bin\OpenSSL.crypto.pyd"
 	Delete "$INSTDIR\bin\OpenSSL.rand.pyd"
@@ -674,8 +680,8 @@ Section "Uninstall"
 	Delete "$INSTDIR\bin\pango.pyd"
 	Delete "$INSTDIR\bin\pangocairo.pyd"
 	Delete "$INSTDIR\bin\pyexpat.pyd"
-	Delete "$INSTDIR\bin\python26.dll"
-	Delete "$INSTDIR\bin\pywintypes26.dll"
+	Delete "$INSTDIR\bin\python27.dll"
+	Delete "$INSTDIR\bin\pywintypes27.dll"
 	Delete "$INSTDIR\bin\select.pyd"
 	Delete "$INSTDIR\bin\sqlite3.dll"
 	Delete "$INSTDIR\bin\ssleay32.dll"
diff --git a/setup_win32.py b/setup_win32.py
index d8f24ba92de0440611cba9125cfd699e35787f24..c65b62857634991994d8a197f3471bcaa36b5515 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -31,7 +31,8 @@ if 'gtk' in os.listdir('.'):
 
 options = {
    'build_exe': {
-       'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new'],
+       'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr',
+            'goocanvas'],
        'base': 'Win32GUI',
 	   'bin_excludes': [
             'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',