diff --git a/gajim.iss b/gajim.iss
new file mode 100644
index 000000000..28b52ca57
--- /dev/null
+++ b/gajim.iss
@@ -0,0 +1,35 @@
+; -- Example1.iss --
+; Demonstrates copying 3 files and creating an icon.
+
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING .ISS SCRIPT FILES!
+
+[Setup]
+AppName=Gajim
+AppVerName=Gajim version 0.3
+DefaultDirName={pf}\Gajim
+DefaultGroupName=Gajim
+UninstallDisplayIcon={app}\Gajim.exe
+Compression=lzma
+SolidCompression=yes
+
+[Components]
+Name: "main"; Description: "Main Files"; Types: full compact custom; Flags: fixed
+
+[Tasks]
+Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"; Components: main
+
+[Files]
+Source: "dist\*.pyd"; DestDir: "{app}"
+Source: "dist\*.dll"; DestDir: "{app}"
+Source: "dist\*.zip"; DestDir: "{app}"
+Source: "dist\*.exe"; DestDir: "{app}"; components: main
+Source: "*.ico"; DestDir: "{app}"
+Source: "dist\plugins\gtkgui\*.glade"; DestDir: "{app}\plugins\gtkgui"
+Source: "dist\plugins\gtkgui\icons\sun\*"; DestDir: "{app}\plugins\gtkgui\icons\sun"
+
+[Icons]
+Name: "{group}\Gajim"; Filename: "{app}\runCore.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"
+Name: "{userdesktop}\Gajim"; Filename: "{app}\runCore.exe"; WorkingDir: "{app}"; IconFilename: "{app}\gajim.ico"; Components: main; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\runCore.exe"; Description: "Launch application"; Flags: postinstall nowait skipifsilent
diff --git a/setup_win32.py b/setup_win32.py
new file mode 100644
index 000000000..f86b7800f
--- /dev/null
+++ b/setup_win32.py
@@ -0,0 +1,32 @@
+from distutils.core import setup
+import py2exe
+import glob
+
+includes = ["encodings",
+            "encodings.utf-8",]
+
+opts = {
+    "py2exe": {
+        "includes": "pango,atk,gobject,plugins,plugins.gtkgui,plugins.logger,encodings,encodings.*",
+        "dll_excludes": [
+            "iconv.dll","intl.dll","libatk-1.0-0.dll",
+            "libgdk_pixbuf-2.0-0.dll","libgdk-win32-2.0-0.dll",
+            "libglib-2.0-0.dll","libgmodule-2.0-0.dll",
+            "libgobject-2.0-0.dll","libgthread-2.0-0.dll",
+            "libgtk-win32-2.0-0.dll","libpango-1.0-0.dll",
+            "libpangowin32-1.0-0.dll"
+        ],
+    }
+}
+
+setup(
+    name = "Gajim",
+    description = "A jabber client",
+#    console=["runCore.py"],
+    windows = [{"script": "runCore.py"}],
+    options=opts,
+    data_files=[("plugins/gtkgui", glob.glob("plugins/gtkgui/gtkgui.glade")),
+                ("plugins/gtkgui/icons/sun", glob.glob("plugins/gtkgui/icons/sun/*.*")),
+                ("Messages/fr/LC_MESSAGES", glob.glob("Messages/fr/LC_MESSAGES/*.mo"))
+    ],
+)