diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 63fad8e691..440e6969a9 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -70,6 +70,8 @@ else
     set_default INSTALL_DIR $GNUCASH_DIR\\inst
 fi
 
+set_default WITH_CUTECASH no
+
 
 ####
 set_default LD ld
@@ -305,6 +307,9 @@ set_default LIBDBI_DRIVERS_PATCH2 `pwd`/libdbi-drivers-Makefile.in.patch
 set_default LIBDBI_DRIVERS_PATCH3 `pwd`/libdbi-drivers-dbd_mysql.c.patch
 set_default LIBDBI_DRIVERS_PATCH4 `pwd`/libdbi-drivers-dbd_pgsql.c.patch
 
+set_default CMAKE_URL "http://www.cmake.org/files/v2.8/cmake-2.8.0-win32-x86.zip"
+set_default CMAKE_DIR $GLOBAL_DIR\\cmake
+
 set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
 set_default UPDATE_DOCS yes
 set_default DOCS_REV "HEAD"
@@ -366,6 +371,9 @@ add_step inst_webkit
 if [ "$UPDATE_SOURCES" = "yes" ]; then
  add_step svn_up
 fi
+if [ "$WITH_CUTECASH" = "yes" ]; then
+ add_step inst_cmake
+fi
 add_step inst_gnucash
 add_step inst_docs
 if [ "$CROSS_COMPILE" != "yes" ]; then
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index ac8cdf62ba..1704d795c9 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -395,6 +395,19 @@ EOF
         # Also, for MSVC compiler we need to create an import library
         pexports $_GUILE_UDIR/bin/libguile.dll > $_GUILE_UDIR/lib/libguile.def
         ${DLLTOOL} -d $_GUILE_UDIR/lib/libguile.def -D $_GUILE_UDIR/bin/libguile.dll -l $_GUILE_UDIR/lib/libguile.lib
+        # Also, for MSVC compiler we need to slightly modify the gc.h header
+        GC_H=$_GUILE_UDIR/include/libguile/gc.h
+        grep -v 'extern.*_freelist2;' ${GC_H} > ${GC_H}.tmp
+        mv ${GC_H}.tmp ${GC_H}
+        cat >> ${GC_H} <<EOF
+#ifdef _MSC_VER
+# define LIBGUILEDECL __declspec (dllimport)
+#else
+# define LIBGUILEDECL /* */
+#endif
+extern LIBGUILEDECL SCM scm_freelist2;
+extern LIBGUILEDECL struct scm_t_freelist scm_master_freelist2;
+EOF
         rm -rf ${TMP_UDIR}/guile-*
     fi
     if [ "$CROSS_COMPILE" = "yes" ]; then
@@ -1229,6 +1242,24 @@ function inst_libdbi() {
     fi
 }
 
+function inst_cmake() {
+    setup CMake
+    _CMAKE_UDIR=`unix_path ${CMAKE_DIR}`
+    add_to_env ${_CMAKE_UDIR}/bin PATH
+    if [ -f ${_CMAKE_UDIR}/bin/cmake.exe ]
+    then
+        echo "cmake already installed.  skipping."
+    else
+        wget_unpacked $CMAKE_URL $DOWNLOAD_DIR $CMAKE_DIR
+
+        assert_one_dir ${_CMAKE_UDIR}/cmake-2*
+        mv ${_CMAKE_UDIR}/cmake-2*/* ${_CMAKE_UDIR}
+        rm -rf ${_CMAKE_UDIR}/cmake-2*
+
+        [ -f ${_CMAKE_UDIR}/bin/cmake.exe ] || die "cmake not installed correctly"
+    fi
+}
+
 function inst_webkit() {
     setup WebKit
     _WEBKIT_UDIR=`unix_path ${WEBKIT_DIR}`