diff --git a/ms-windows/osgeo4w/browser.bat.tmpl b/ms-windows/osgeo4w/browser.bat.tmpl
new file mode 100644
index 000000000000..538f92cf3579
--- /dev/null
+++ b/ms-windows/osgeo4w/browser.bat.tmpl
@@ -0,0 +1,8 @@
+@echo off
+
+SET OSGEO4W_ROOT=@osgeo4w@
+call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
+call "%OSGEO4W_ROOT%"\apps\grass\grass-@grassversion@\etc\env.bat
+@echo off
+path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib
+start "Quantum GIS Browser" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qbrowser.exe %*
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
index f1990ff08191..66a369aa4125 100755
--- a/ms-windows/osgeo4w/package.cmd
+++ b/ms-windows/osgeo4w/package.cmd
@@ -92,9 +92,9 @@ cmake -G "Visual Studio 9 2008" ^
 	-D WITH_GLOBE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
-	-D SQLITE3_LIBRARY=%OSGEO4W_ROOT%/lib/sqlite3_i.lib ^
-	-D SPATIALITE_LIBRARY=%OSGEO4W_ROOT%/lib/spatialite_i.lib ^
+	-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c_i.lib ^
+	-D SQLITE3_LIBRARY=%O4W_ROOT%/lib/sqlite3_i.lib ^
+	-D SPATIALITE_LIBRARY=%O4W_ROOT%/lib/spatialite_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
 	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
 	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
@@ -124,11 +124,11 @@ if not errorlevel 1 goto error
 
 echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
-if errorlevel 1 goto error 
+if errorlevel 1 goto error
 
 echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
-if errorlevel 1 goto error 
+if errorlevel 1 goto error
 
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
@@ -153,9 +153,6 @@ touch exclude
 tar -C %OSGEO4W_ROOT% -cjf %PACKAGENAME%-%VERSION%-%PACKAGE%.tar.bz2 ^
 	--exclude-from exclude ^
 	--exclude "*.pyc" ^
-	--exclude "apps/%PACKAGENAME%/themes/classic/grass" ^
-	--exclude "apps/%PACKAGENAME%/themes/default/grass" ^
-	--exclude "apps/%PACKAGENAME%/themes/gis/grass" ^
 	--exclude "apps/%PACKAGENAME%/grass" ^
 	--exclude "apps/%PACKAGENAME%/bin/qgisgrass.dll" ^
 	--exclude "apps/%PACKAGENAME%/plugins/grassrasterprovider.dll" ^