diff --git a/configure.ac b/configure.ac
index 4950eb18..26f8dedf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -600,6 +600,7 @@ AC_CONFIG_FILES([
 	win32/Makefile
 	win32/versioninfo.rc
 	win32/winconfig.h
+	win32/OpenSC.iss
 ])
 AC_OUTPUT
 
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 2a8c35e9..39c47520 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
 		$(srcdir)/versioninfo.rc $(srcdir)/winconfig.h
 EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
-		versioninfo.rc.in winconfig.h.in
+		versioninfo.rc.in winconfig.h.in OpenSC.iss.in
 dist_noinst_HEADERS = versioninfo.rc winconfig.h
 
 if WIN32
diff --git a/win32/OpenSC.iss b/win32/OpenSC.iss.in
similarity index 86%
rename from win32/OpenSC.iss
rename to win32/OpenSC.iss.in
index 93c1e977..7e8393f7 100644
--- a/win32/OpenSC.iss
+++ b/win32/OpenSC.iss.in
@@ -1,12 +1,12 @@
 [Setup]
 AppName=OpenSC
-AppVerName=OpenSC 0.12.0
+AppVerName=OpenSC @PACKAGE_VERSION@
 AppPublisher=OpenSC Project
 AppPublisherURL=http://www.opensc-project.org/
 AppSupportURL=http://www.opensc-project.org/opensc/
 AppUpdatesURL=http://www.opensc-project.org/opensc/
 DefaultDirName={pf}\OpenSC Project\OpenSC
-OutputBaseFilename=OpenSC-0.12.0
+OutputBaseFilename=OpenSC-@PACKAGE_VERSION@
 Compression=lzma/normal
 SolidCompression=true
 MinVersion=0,5.0.2195
@@ -19,10 +19,10 @@ ShowLanguageDialog=auto
 AppID={{BDD73EB0-0485-4B79-93EC-CF2EAEFF3BAB}
 UsePreviousAppDir=true
 AppendDefaultDirName=false
-AppVersion=0.12.0
-VersionInfoVersion=0.12.0
+AppVersion=@PACKAGE_VERSION@
+VersionInfoVersion=@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@
 VersionInfoDescription=OpenSC tools and libraries
-VersionInfoTextVersion=v0.12.0
+VersionInfoTextVersion=v@PACKAGE_VERSION@
 DisableReadyPage=true
 InternalCompressLevel=max
 VersionInfoCopyright=2010 OpenSC Project
@@ -34,7 +34,7 @@ WizardImageBackColor=clWhite
 DisableFinishedPage=false
 InfoBeforeFile=README.rtf
 VersionInfoProductName=OpenSC
-VersionInfoProductVersion=0.12.0
+VersionInfoProductVersion=@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@
 AllowRootDirectory=true
 UninstallDisplayName=OpenSC
 DefaultGroupName=OpenSC