diff --git a/windows/amdicon.ico b/windows/amdicon.ico
new file mode 100644
index 000000000..616240ad1
Binary files /dev/null and b/windows/amdicon.ico differ
diff --git a/windows/setup.py b/windows/setup.py
index f401cc337..35cba7f49 100644
--- a/windows/setup.py
+++ b/windows/setup.py
@@ -3,11 +3,43 @@ import py2exe
 
 import glob
 
+lnf_manifest = """
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
+manifestVersion="1.0">
+<assemblyIdentity
+    version="0.64.1.0"
+    processorArchitecture="x86"
+    name="Controls"
+    type="win32"
+/>
+<description>%s</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
+"""
+
+
 setup_args = {
     'name': 'Tahoe',
     'description': 'Allmydata Tahoe distributated storage',
     'author': 'Allmydata, Inc.',
     'windows': [
+        {
+            'script': 'confwiz.py',
+            'icon_resources': [(1, 'amdicon.ico')],
+            'other_resources': [(24,1,lnf_manifest%'Allmydata Tahoe Config Wizard')],
+        },
     ],
     'console': [
         'tahoe.py',