Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py	(revision 37319)
+++ build/generator/gen_base.py	(working copy)
@@ -534,12 +534,12 @@
 
     assert iname[-2:] == '.i'
     cname = iname[:-2] + '.c'
-    oname = iname[:-2] + self.gen_obj._extension_map['lib', 'object']
+    oname = iname[:-2] + self.gen_obj._extension_map['pylib', 'object']
 
     # Extract SWIG module name from .i file name
     module_name = iname[:4] != 'svn_' and iname[:-2] or iname[4:-2]
 
-    lib_extension = self.gen_obj._extension_map['lib', 'target']
+    lib_extension = self.gen_obj._extension_map['pylib', 'target']
     if self.lang == "ruby":
       lib_filename = module_name + lib_extension
     elif self.lang == "perl":
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py	(revision 37319)
+++ build/generator/gen_win.py	(working copy)
@@ -34,6 +34,8 @@
     ('exe', 'object'): '.obj',
     ('lib', 'target'): '.dll',
     ('lib', 'object'): '.obj',
+    ('pylib', 'target'): '.pyd',
+    ('pylib', 'object'): '.obj',
     }
 
   def parse_options(self, options):