diff --git a/CMakeLists.txt b/CMakeLists.txt
index c25e3d765..22a09a252 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,8 @@ else (PYTHON_CMD STREQUAL "default")
   SET( PYTHON_EXE ${PYTHON_CMD} )
 endif (PYTHON_CMD STREQUAL "default")
 
+INCLUDE(cmake/fortran.cmake)
+
 # configuration
 CONFIGURE_FILE (
     ${PROJECT_SOURCE_DIR}/config.h_cmake.in
diff --git a/Cantera/CMakeLists.txt b/Cantera/CMakeLists.txt
index febd4f0ab..fa00bcc21 100644
--- a/Cantera/CMakeLists.txt
+++ b/Cantera/CMakeLists.txt
@@ -1 +1,9 @@
 add_subdirectory(src)
+
+if (BUILD_F90_INTERFACE)
+    add_subdirectory(fortran)
+endif (BUILD_F90_INTERFACE) 
+
+if (BUILD_MATLAB_TOOLBOX)
+    add_subdirectory(matlab)
+endif (BUILD_MATLAB_TOOLBOX) 
diff --git a/Cantera/fortran/src/fct.cpp b/Cantera/fortran/src/fct.cpp
index c9af96439..ffacba4a5 100644
--- a/Cantera/fortran/src/fct.cpp
+++ b/Cantera/fortran/src/fct.cpp
@@ -29,7 +29,7 @@
 #include "flib_defs.h"
 
 // Assign storage for the templated classes' static member
-template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage=0;
+//template<> Cabinet<XML_Node> * Cabinet<XML_Node>::__storage=0;
 
 inline XML_Node* _xml(const integer* n) {
     return Cabinet<XML_Node>::cabinet()->item(*n);
diff --git a/Cantera/src/base/misc.cpp b/Cantera/src/base/misc.cpp
index 15c12f770..88f758352 100755
--- a/Cantera/src/base/misc.cpp
+++ b/Cantera/src/base/misc.cpp
@@ -1180,8 +1180,7 @@ protected:
         //
         // add a default data location for Mac OS X
         //
-        if (DARWIN > 0) 
-            dirs.push_back("/Applications/Cantera/data");
+        dirs.push_back("/Applications/Cantera/data");
 #endif
 
         //
diff --git a/config.cmake b/config.cmake
index e2469eaab..521db17c2 100755
--- a/config.cmake
+++ b/config.cmake
@@ -58,8 +58,9 @@
 #              build process
 #    default   try to do a full installation, but fall back to a minimal
 #              one in case of errors
+OPTION(BUILD_PYTHON_PACKAGE "Build the Python Package?")
 
-SET( PYTHON_PACKAGE  "default")
+SET(PYTHON_PACKAGE "default" CACHE STRING "full or minimal")
 
 # Cantera needs to know where to find the Python interpreter.  If
 # PYTHON_CMD is set to "default", then cmake will look for the Python
@@ -75,4 +76,8 @@ SET( USE_NUMERIC "default")
 # home directory for numarray.
 SET( NUMARRAY_HOME "$HOME/python_packages")
 
-SET( CANTERA_VERSION "1.7.1")
\ No newline at end of file
+SET( CANTERA_VERSION "1.7.1")
+
+
+SET( BUILD_F90_INTERFACE 1)
+SET( F90 "default" )