diff --git a/.gitignore b/.gitignore
index 2f38378..a916122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,8 @@ missing
 m4/
 libmodbus.pc
 libmodbus.spec
-modbus-version.h
+src/modbus-version.h
+src/win32/modbus.dll.manifest
 .deps
 .libs
 *.la
diff --git a/configure.ac b/configure.ac
index e54409a..faf170f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ AC_CONFIG_FILES([
         Makefile
         src/Makefile
         src/modbus-version.h
+        src/win32/modbus.dll.manifest
         doc/Makefile
         tests/Makefile
         libmodbus.pc
diff --git a/src/win32/Readme-win32 b/src/win32/Readme-win32
index 31ebcdf..c08befb 100644
--- a/src/win32/Readme-win32
+++ b/src/win32/Readme-win32
@@ -1,26 +1,17 @@
-
 Intro
 -----
 
-This directory contains the project file for Visual
-Studio 2008 to build a modbus.dll.
-
-The project file searches for D:/include/msvc_std to
-find stdint.h. See ../../README.rst
-
-config.h and modbus-version.h were generated using
-a Windows native experimental port of zsh and Microsoft cl.
+This directory contains the project file for Visual Studio 2008 to build a
+modbus.dll.
 
-Please note that modbus.dll.manifest hardcodes
-the version number !
+The project file searches for D:/include/msvc_std to find stdint.h.
+See ../../README.rst
 
+config.h and modbus-version.h were generated using a Windows native experimental
+port of zsh and Microsoft cl.
 
 
 TODO
 ----
 
-Fix the ugly need to have config.h and modbus-version.h
-in this directory.
-
-
-oldfaber
+Fix the ugly need to have config.h and modbus-version.h in this directory.
diff --git a/src/win32/modbus.dll.manifest b/src/win32/modbus.dll.manifest.in
index 9934ce5..22ae3e0 100644
--- a/src/win32/modbus.dll.manifest
+++ b/src/win32/modbus.dll.manifest.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity	version="3.1.0.1"	processorArchitecture="*"	name="modbus"/>
+<assemblyIdentity version="@LIBMODBUS_VERSION@"	processorArchitecture="*" name="modbus"/>
 <description>Zsh shell</description>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>