diff --git a/setup/hosting.py b/setup/hosting.py
index 8dd947a16c..8707388181 100644
--- a/setup/hosting.py
+++ b/setup/hosting.py
@@ -164,7 +164,7 @@ class GoogleCode(Base):# {{{
         typ = 'Type-' + ('Source' if fname.endswith('.xz') else 'Archive' if
                 fname.endswith('.zip') else 'Installer')
         ext = os.path.splitext(fname)[1][1:]
-        op  = 'OpSys-'+{'msi':'Windows','zip':'Windows',
+        op  = 'OpSys-'+{'msi':'Windows','exe':'Windows',
                 'dmg':'OSX','bz2':'Linux','xz':'All'}[ext]
         desc = self.files[fname]
         start = time.time()
diff --git a/setup/upload.py b/setup/upload.py
index e8c44f941e..734cd30fa6 100644
--- a/setup/upload.py
+++ b/setup/upload.py
@@ -43,7 +43,7 @@ def installer_description(fname):
         return 'Windows installer'
     if fname.endswith('.dmg'):
         return 'OS X dmg'
-    if fname.endswith('.zip'):
+    if fname.endswith('.exe'):
         return 'Calibre Portable'
     return 'Unknown file'