diff --git a/configure.ac b/configure.ac
index 09494768..941b534f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -736,6 +736,7 @@ AC_CONFIG_FILES([
 	src/minidriver/opensc-minidriver.inf
 	win32/Makefile
 	win32/versioninfo.rc
+	win32/versioninfo-customactions.rc
 	win32/winconfig.h
 	win32/OpenSC.iss
 	win32/OpenSC.wxs
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 9723a35a..8bdb1df1 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,8 +1,10 @@
+include $(top_srcdir)/win32/ltrc.inc
+
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
 		$(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf \
-                $(srcdir)/dlgbmp.bmp $(srcdir)/bannrbmp.bmp
+                $(srcdir)/dlgbmp.bmp $(srcdir)/bannrbmp.bmp $(srcdir)/versioninfo-customactions.rc
 EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
-		versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in
+		versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in versioninfo-customactions.rc.in
 dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico dlgbmp.bmp bannrbmp.bmp
 
 if WIN32
@@ -15,7 +17,7 @@ lib_LTLIBRARIES = customactions@LIBRARY_BITNESS@.la
 AM_CPPFLAGS = -I$(top_srcdir)
 
 
-customactions@LIBRARY_BITNESS@_la_SOURCES = customactions.cpp customactions.exports
+customactions@LIBRARY_BITNESS@_la_SOURCES = customactions.cpp customactions.exports versioninfo-customactions.rc
 customactions@LIBRARY_BITNESS@_la_LIBADD =  \
 	$(top_builddir)/win32/customactions.la
 customactions@LIBRARY_BITNESS@_la_LDFLAGS = $(AM_LDFLAGS) \
diff --git a/win32/Makefile.mak b/win32/Makefile.mak
index f4d580fd..465e2f44 100644
--- a/win32/Makefile.mak
+++ b/win32/Makefile.mak
@@ -2,16 +2,16 @@ TOPDIR = ..
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-all: config.h
+all: versioninfo-customactions.res config.h
 
 config.h: winconfig.h
 	copy /y winconfig.h config.h
 
-customactions.dll: customactions.obj
+customactions.dll: versioninfo-customactions.res customactions.obj
 	echo LIBRARY $* > $*.def
 	echo EXPORTS >> $*.def
 	type customactions.exports >> $*.def
-        link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
+        link /dll $(LINKFLAGS) /def:$*.def /out:customactions.dll versioninfo-customactions.res customactions.obj msi.lib $(WIX_LIBS) Advapi32.lib User32.lib Version.lib Shell32.lib
 
 OpenSC.msi: OpenSC.wixobj
         $(WIX_PATH)\bin\light.exe -sh -ext WixUIExtension -ext WiXUtilExtension $?
diff --git a/win32/versioninfo-customactions.rc.in b/win32/versioninfo-customactions.rc.in
new file mode 100644
index 00000000..757e9165
--- /dev/null
+++ b/win32/versioninfo-customactions.rc.in
@@ -0,0 +1,37 @@
+#include <winresrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+	PRODUCTVERSION @OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@
+	FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+	FILEFLAGS 0x21L
+#else
+	FILEFLAGS 0x20L
+#endif
+	FILEOS 0x40004L
+	FILETYPE 0x2L
+	FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "Comments", "@OPENSC_VS_FF_COMMENTS@"
+			VALUE "CompanyName", "@OPENSC_VS_FF_COMPANY_NAME@"
+			VALUE "FileVersion", "@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.@OPENSC_VERSION_REVISION@"
+			VALUE "InternalName", "@PACKAGE_NAME@"
+			VALUE "LegalCopyright", "@OPENSC_VS_FF_LEGAL_COPYRIGHT@"
+			VALUE "LegalTrademarks", ""
+			VALUE "PrivateBuild", ""
+			VALUE "ProductName", "@OPENSC_VS_FF_PRODUCT_NAME@"
+			VALUE "ProductVersion", "@OPENSC_VERSION_MAJOR@,@OPENSC_VERSION_MINOR@,@OPENSC_VERSION_FIX@,@OPENSC_VERSION_REVISION@"
+			VALUE "SpecialBuild", ""
+			VALUE "FileDescription", "OpenSC custom actions setup"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1200
+	END
+END