  			<Tool
  				Name="VCLinkerTool"
 -				AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++				AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib"
  				TargetMachine="17"
  			/>
  			<Tool
 --- misc/Python-2.6.1/setup.py	2009-11-02 10:12:43.000000000 +0000
 +++ misc/build/Python-2.6.1/setup.py	2009-11-02 10:18:19.000000000 +0000
-@@ -612,7 +612,15 @@
+@@ -612,7 +612,12 @@
          exts.append( Extension('_socket', ['socketmodule.c'],
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
-+        UPDMINOR = os.environ.get('UPDMINOREXT')
 +        ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
 +            os.environ.get('INPATH') + '/' + \
 +            'inc'
-+        if UPDMINOR != None:
-+            ooosslinc = ooosslinc + UPDMINOR
 +        ooosslinc = ooosslinc + '/external/'
          search_for_ssl_incs_in = [
 +                              ooosslinc,
                                '/usr/local/ssl/include',
                                '/usr/contrib/ssl/include/'
                               ]
-@@ -624,8 +632,15 @@
+@@ -624,8 +632,13 @@
                                 ['/usr/kerberos/include'])
              if krb5_h:
                  ssl_incs += krb5_h
 +        ooossllib = os.environ.get('SOLARVER') + '/' + \
 +            os.environ.get('INPATH') + '/' + \
 +            'lib'
-+        if UPDMINOR != None:
-+            ooosslinc = ooosslinc + UPDMINOR
 +        ooosslinc = ooosslinc + '/'
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',

 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc64"
+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(opensslDir)\inc32"
+				AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
