diff --git a/win32/msvc/lasso.dsp b/win32/msvc/lasso.dsp
index e77ded90..3a83ea91 100644
--- a/win32/msvc/lasso.dsp
+++ b/win32/msvc/lasso.dsp
@@ -315,6 +315,26 @@ SOURCE=..\..\lasso\xml\lib_subject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\lasso\xml\sa_parameter.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_password_transforms.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_sasl_request.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_sasl_response.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_transform.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\lasso\xml\saml_advice.c
 # End Source File
 # Begin Source File
@@ -502,10 +522,6 @@ SOURCE=..\..\lasso\errors.c
 
 SOURCE=..\..\lasso\lasso.c
 # End Source File
-# Begin Source File
-
-SOURCE=.\vsnprintf.c
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -739,6 +755,26 @@ SOURCE=..\..\lasso\xml\private.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\lasso\xml\sa_parameter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_password_transforms.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_sasl_request.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_sasl_response.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\lasso\xml\sa_transform.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\lasso\xml\saml_advice.h
 # End Source File
 # Begin Source File
@@ -952,7 +988,32 @@ SOURCE=..\..\lasso\lasso.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\lasso\lasso_config.h
+SOURCE=.\lasso_config.h
+
+!IF  "$(CFG)" == "lasso - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\lasso_config.h
+InputName=lasso_config
+
+"..\..\$(InputName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\..\lasso
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "lasso - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\lasso_config.h
+InputName=lasso_config
+
+"..\..\$(InputName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy $(InputPath) ..\..\lasso
+
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Resource Files"
@@ -963,5 +1024,36 @@ SOURCE=..\..\lasso\lasso_config.h
 SOURCE=..\lasso.rc
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=..\..\lasso\extract_types.py
+
+!IF  "$(CFG)" == "lasso - Win32 Release"
+
+# Begin Custom Build
+InputDir=\lasso\lasso-0.6.1rc1\lasso
+InputPath=..\..\lasso\extract_types.py
+
+"$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd $(InputDir) 
+	I:\Python24\python.exe extract_types.py 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "lasso - Win32 Debug"
+
+# Begin Custom Build
+InputDir=\lasso\lasso-0.6.1rc1\lasso
+InputPath=..\..\lasso\extract_types.py
+
+"$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	cd $(InputDir) 
+	I:\Python24\python.exe extract_types.py 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Target
 # End Project
diff --git a/win32/msvc/lasso.dsw b/win32/msvc/lasso.dsw
index 1cce6dda..9d3287cd 100644
--- a/win32/msvc/lasso.dsw
+++ b/win32/msvc/lasso.dsw
@@ -11,6 +11,9 @@ Package=<5>
 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name python
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -27,6 +30,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "python"=".\python\python.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Global:
 
 Package=<5>
diff --git a/win32/msvc/python/python.dsp b/win32/msvc/python/python.dsp
new file mode 100644
index 00000000..29949606
--- /dev/null
+++ b/win32/msvc/python/python.dsp
@@ -0,0 +1,107 @@
+# Microsoft Developer Studio Project File - Name="python" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=python - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "python.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "python.mak" CFG="python - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "python - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "python - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "python - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python23\include" /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "NDEBUG"
+# ADD RSC /l 0x40c /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /out:"Release\_lasso.dll" /libpath:"..\Release" /libpath:"I:\Python23\libs" /libpath:"h:\lasso-deps\lib"
+
+!ELSEIF  "$(CFG)" == "python - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "h:\lasso-deps\include" /I "h:\lasso-deps\include\glib-2.0" /I "h:\lasso-deps\lib\glib-2.0\include" /I "I:\Python23\include" /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PYTHON_EXPORTS" /FR /YX /FD /GZ /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x40c /d "_DEBUG"
+# ADD RSC /l 0x40c /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib lasso-3.lib libxml2.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /debug /machine:I386 /out:"Debug\_lasso.dll" /pdbtype:sept /libpath:"..\Debug" /libpath:"I:\Python23\libs" /libpath:"h:\lasso-deps\lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "python - Win32 Release"
+# Name "python - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\python\lasso_wrap.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project