diff --git a/cli/cli.pro b/cli/cli.pro
index 536337268..a990736cc 100644
--- a/cli/cli.pro
+++ b/cli/cli.pro
@@ -17,7 +17,7 @@ HEADERS += cppcheckexecutor.cpp \
 win32 {
     CONFIG += embed_manifest_exe console
     RC_FILE = cppcheck.rc
-    HEADERS += resource.h
+    HEADERS += ../lib/resource.h
     LIBS += -lshlwapi
 }
 
diff --git a/lib/cppcheck.rc b/cli/cppcheck.rc
similarity index 100%
rename from lib/cppcheck.rc
rename to cli/cppcheck.rc
diff --git a/gui/gui.pro b/gui/gui.pro
index 5e314077a..7ec80f95c 100644
--- a/gui/gui.pro
+++ b/gui/gui.pro
@@ -67,7 +67,7 @@ SOURCES += main.cpp \
 
 win32 {
 	RC_FILE = cppcheck-gui.rc
-	HEADERS += ../src/resource.h
+	HEADERS += ../lib/resource.h
 	LIBS += -lshlwapi
 }
 
diff --git a/win_installer/build.proj b/win_installer/build.proj
deleted file mode 100755
index c4d5579f5..000000000
--- a/win_installer/build.proj
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project
-    xmlns="http://schemas.microsoft.com/developer/msbuild/2003"
-    DefaultTargets="build">
-
-    <!-- build windows installers -->
-    <Target Name="build">
-        <Exec Command="build1.bat"/>
-        <Exec Command="build2.bat"/>
-    </Target>
-</Project>
diff --git a/win_installer/build1.bat b/win_installer/build1.bat
index 9b0928e08..5847c7327 100755
--- a/win_installer/build1.bat
+++ b/win_installer/build1.bat
@@ -8,9 +8,7 @@ set QMAKESPEC=win32-g++
 cd ..
 
 del gui\Makefile
-del src\Makefile
 del /Q gui\temp\*
-del /Q src\temp\*
 del gui\release\gui.exe
 cd gui
 qmake -config release
diff --git a/win_installer/build2.bat b/win_installer/build2.bat
index 0c616b950..51f4c06e0 100755
--- a/win_installer/build2.bat
+++ b/win_installer/build2.bat
@@ -1,24 +1,16 @@
-del *.wixobj
-del *.wixpdb
-del cppcheck.exe
-del gui.exe
+
+set QTDIR=c:\Qt\2009.01\qt
+set PATH=c:\Qt\2009.01\qt\bin
+set PATH=%PATH%;c:\Qt\2009.01\bin;c:\Qt\2009.01\mingw\bin
+set PATH=%PATH%;%SystemRoot%\System32
+set QMAKESPEC=win32-g++
 
 cd ..
-del /Q release\*
-del cppcheck.exe
-del cppcheck.map
-del cppcheck.tds
 
-msbuild cppcheck.cbproj /target:clean
-msbuild cppcheck.cbproj /target:build /property:"config=release"
-
-copy cppcheck.exe win_installer
-copy gui\release\gui.exe win_installer
-
-cd win_installer
-candle cppcheck.wxs
-light -ext WixUIExtension cppcheck.wixobj
-rename cppcheck.msi cppcheck-light.msi
-candle gui.wxs
-light -ext WixUIExtension gui.wixobj
+del cli\Makefile
+del /Q cli\temp\*
+del cli\release\gui.exe
+cd cli
+qmake -config release
+make
 
diff --git a/win_installer/build3.bat b/win_installer/build3.bat
new file mode 100755
index 000000000..024c59c8c
--- /dev/null
+++ b/win_installer/build3.bat
@@ -0,0 +1,12 @@
+del *.wixobj
+del *.wixpdb
+del *.msi
+
+del gui.exe
+del cppcheck.exe
+copy ..\gui\release\gui.exe .
+copy ..\cli\release\cppcheck.exe .
+
+candle gui.wxs
+light -ext WixUIExtension gui.wixobj
+move gui.msi cppcheck.msi