diff --git a/win32/msvc/lasso.dsp.in b/win32/msvc/lasso.dsp.in
index 1c1f6598..2667ce2c 100644
--- a/win32/msvc/lasso.dsp.in
+++ b/win32/msvc/lasso.dsp.in
@@ -1039,7 +1039,7 @@ SOURCE=..\..\lasso\extract_types.py
 !IF  "$(CFG)" == "lasso - Win32 Release"
 
 # Begin Custom Build
-InputDir=\lasso\lasso-0.6.1rc2\lasso
+InputDir=\lasso\lasso-@PACKAGE_VERSION@\lasso
 InputPath=..\..\lasso\extract_types.py
 
 "$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -1051,7 +1051,7 @@ InputPath=..\..\lasso\extract_types.py
 !ELSEIF  "$(CFG)" == "lasso - Win32 Debug"
 
 # Begin Custom Build
-InputDir=\lasso\lasso-0.6.1rc2\lasso
+InputDir=\lasso\lasso-@PACKAGE_VERSION@\lasso
 InputPath=..\..\lasso\extract_types.py
 
 "$(InputDir)\types.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
diff --git a/win32/nsis/jlasso-lite.nsi.in b/win32/nsis/jlasso-lite.nsi.in
index 04842d5b..39e16483 100644
--- a/win32/nsis/jlasso-lite.nsi.in
+++ b/win32/nsis/jlasso-lite.nsi.in
@@ -48,7 +48,7 @@ SetCompressor bzip2
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "Install-java-lite-0_6_0.exe"
+OutFile "Install-java-lite-@VERSION_UNDERSCORED.exe"
 InstallDir "$PROGRAMFILES\Liberty Alliance Single Sign On Java"
 ShowInstDetails show
 ShowUnInstDetails show