diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f0b09e3c..5b598bacf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ if (GTSAM_BUILD_TESTS)
 endif()
 
 # Find boost
-if(MSVC)
+if(CYGWIN OR MSVC OR WIN32)
   set(Boost_USE_STATIC_LIBS 1)
 endif()
 find_package(Boost 1.40 COMPONENTS serialization system chrono filesystem REQUIRED)
@@ -140,6 +140,10 @@ if (GTSAM_BUILD_UNSTABLE)
     add_subdirectory(gtsam_unstable)
 endif(GTSAM_BUILD_UNSTABLE)
 
+# Make config file
+include(GtsamMakeConfigFile)
+GtsamMakeConfigFile(gtsam)
+
 # Set up CPack
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "GTSAM")
 set(CPACK_PACKAGE_VENDOR "Frank Dellaert, Georgia Institute of Technology")