diff --git a/gajim.nsi b/gajim.nsi
index 9b0f49c44..007e1cf4c 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -156,6 +156,7 @@ Section "Gajim" SecGajim
 
 	SetOutPath "$INSTDIR\bin"
 	File "bin\_bsddb.pyd"
+    File "bin\_cffi_backend.pyd"
 	File "bin\_ctypes.pyd"
 	File "bin\_hashlib.pyd"
 	File "bin\_socket.pyd"
@@ -171,6 +172,9 @@ Section "Gajim" SecGajim
 	File "bin\Crypto.Random.OSRNG.winrandom.pyd"
 	File "bin\Crypto.Util._counter.pyd"
 	File "bin\Crypto.Util.strxor.pyd"
+    File "bin\cryptography.hazmat.bindings._constant_time.pyd"
+    File "bin\cryptography.hazmat.bindings._openssl.pyd"
+    File "bin\cryptography.hazmat.bindings._padding.pyd"
     File "bin\farstream.pyd"
 	File "bin\gajim.exe"
 	File "bin\gio._gio.pyd"
@@ -181,7 +185,6 @@ Section "Gajim" SecGajim
     File "bin\gst.interfaces.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"
@@ -194,11 +197,9 @@ Section "Gajim" SecGajim
 	File "bin\python27.dll"
 	File "bin\pythoncom27.dll"
 	File "bin\pywintypes27.dll"
-	File "bin\OpenSSL.rand.pyd"
 	File "bin\select.pyd"
 	File "bin\sqlite3.dll"
 	File "bin\ssleay32.dll"
-	File "bin\OpenSSL.SSL.pyd"
 	File "bin\unicodedata.pyd"
 	File "bin\win32api.pyd"
 	File "bin\win32file.pyd"
@@ -542,56 +543,6 @@ Section "Uninstall"
 	RMDir /r "$INSTDIR\bin\gtk\share"
 	RMDir "$INSTDIR\bin\gtk"
 	RMDir "$INSTDIR\bin\win32com"
-	Delete "$INSTDIR\bin\_bsddb.pyd"
-	Delete "$INSTDIR\bin\_ctypes.pyd"
-	Delete "$INSTDIR\bin\_hashlib.pyd"
-	Delete "$INSTDIR\bin\_socket.pyd"
-	Delete "$INSTDIR\bin\_sqlite3.pyd"
-	Delete "$INSTDIR\bin\_ssl.pyd"
-	Delete "$INSTDIR\bin\atk.pyd"
-	Delete "$INSTDIR\bin\bz2.pyd"
-	Delete "$INSTDIR\bin\cairo._cairo.pyd"
-	Delete "$INSTDIR\bin\Crypto.Cipher._AES.pyd"
-    Delete "$INSTDIR\bin\Crypto.Cipher._DES.pyd"
-    Delete "$INSTDIR\bin\Crypto.Cipher._DES3.pyd"
-	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\farstream.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\gst._gst.pyd"
-    Delete "$INSTDIR\bin\gst.interfaces.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\libxml2mod.pyd"
-    Delete "$INSTDIR\bin\libxmlmods.libxml2mod.pyd"
-	Delete "$INSTDIR\bin\OpenSSL.crypto.pyd"
-	Delete "$INSTDIR\bin\OpenSSL.rand.pyd"
-	Delete "$INSTDIR\bin\OpenSSL.SSL.pyd"
-	Delete "$INSTDIR\bin\pango.pyd"
-	Delete "$INSTDIR\bin\pangocairo.pyd"
-	Delete "$INSTDIR\bin\pycurl.pyd"
-	Delete "$INSTDIR\bin\pyexpat.pyd"
-	Delete "$INSTDIR\bin\python27.dll"
-	Delete "$INSTDIR\bin\pythoncom27.dll"
-	Delete "$INSTDIR\bin\pywintypes27.dll"
-	Delete "$INSTDIR\bin\select.pyd"
-	Delete "$INSTDIR\bin\sqlite3.dll"
-	Delete "$INSTDIR\bin\ssleay32.dll"
-	Delete "$INSTDIR\bin\unicodedata.pyd"
-	Delete "$INSTDIR\bin\win32api.pyd"
-	Delete "$INSTDIR\bin\win32file.pyd"
-	Delete "$INSTDIR\bin\win32pipe.pyd"
-	Delete "$INSTDIR\bin\win32ui.pyd"
-	Delete "$INSTDIR\bin\winsound.pyd"
-	Delete "$INSTDIR\bin\msvcr90.dll"
 	RMDir /r "$INSTDIR\bin"
 	RMDir /r "$INSTDIR\data\gui"
 	RMDir /r "$INSTDIR\data\moods"
diff --git a/setup_win32.py b/setup_win32.py
index b0001f897..b63e30943 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -35,6 +35,7 @@ options = {
             'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC',
             'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'],
        'base': 'Win32GUI',
+        'packages': ['cffi', 'cryptography']
 	   'bin_excludes': [
             'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
             'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',