diff --git a/Makefile.in b/Makefile.in
index 970b1dadf..b5091c6ad 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ win-install: hdr-install win-kernel-install data-install python-install matlab-i
 demos: example_codes
 
 # build the Cantera static libraries
-kernel: info 
+kernel:  
 	@INSTALL@ -d @buildlib@
 	rm -f @buildlib@/*.a
 	rm -f @buildlib@/*.so
@@ -50,7 +50,7 @@ clib:
 	ranlib @buildlib@/*.a
 
 cxxlib: 
-	cd Cantera/cxx; @MAKE@
+	cd Cantera/cxx/src; @MAKE@
 
 utils:
 	cd tools; @MAKE@
@@ -89,7 +89,7 @@ hdr-collect:
 	@INSTALL@ -d build/include/cantera/kernel/zeroD
 	@INSTALL@ -d build/include/cantera/kernel/converters
 	@INSTALL@ -d build/include/cantera/kernel/transport
-	@INSTALL@ include/*.h build/include/cantera
+	@INSTALL@ Cantera/cxx/include/*.h build/include/cantera
 	@INSTALL@ config.h build/include/cantera
 	@INSTALL@ Cantera/src/*.h build/include/cantera/kernel
 	@INSTALL@ Cantera/src/oneD/*.h build/include/cantera/kernel/oneD
@@ -226,8 +226,8 @@ pack: export
           tar cvf cantera-$(version).tar cantera-$(version)/*; \
 	  gzip cantera-$(version).tar)
 
-info:
-	echo '#define CANTERA_ROOT "@prefix@/cantera"' > include/ctdir.h
+#info:
+#	echo '#define CANTERA_ROOT "@prefix@/cantera"' > include/ctdir.h
 
 
 
diff --git a/config/configure b/config/configure
index 204f03ee3..482928a7c 100755
--- a/config/configure
+++ b/config/configure
@@ -3689,7 +3689,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/matlab/Makefile ../Cantera/matlab/setup_matlab.py ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files ../Cantera/Makefile ../Cantera/src/Makefile ../Cantera/src/zeroD/Makefile ../Cantera/src/oneD/Makefile ../Cantera/src/converters/Makefile ../Cantera/src/transport/Makefile ../Cantera/clib/src/Makefile ../Cantera/fortran/src/Makefile ../Cantera/fortran/f77demos/f77demos.mak ../Cantera/matlab/Makefile ../Cantera/matlab/setup_matlab.py ../Cantera/python/Makefile ../Cantera/python/setup.py ../Cantera/cxx/src/Makefile ../Cantera/user/Makefile ../Cantera/python/src/Makefile ../ext/lapack/Makefile ../ext/blas/Makefile ../ext/cvode/Makefile ../ext/math/Makefile ../ext/tpx/Makefile ../ext/Makefile ../ext/recipes/Makefile ../examples/Makefile ../examples/cxx/Makefile ../Makefile ../tools/Makefile ../tools/src/Makefile ../tools/src/sample.mak ../tools/src/finish_install.py ../tools/src/package4mac ../tools/templates/f77/demo.mak ../tools/templates/cxx/demo.mak ../tools/testtools/Makefile ../data/inputs/Makefile ../test_problems/Makefile ../test_problems/cxx_ex/Makefile ../test_problems/silane_equil/Makefile ../test_problems/surfkin/Makefile ../test_problems/diamondSurf/Makefile"
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -4174,7 +4174,7 @@ do
   "../Cantera/matlab/setup_matlab.py" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/matlab/setup_matlab.py" ;;
   "../Cantera/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/python/Makefile" ;;
   "../Cantera/python/setup.py" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/python/setup.py" ;;
-  "../Cantera/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/cxx/Makefile" ;;
+  "../Cantera/cxx/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/cxx/src/Makefile" ;;
   "../Cantera/user/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/user/Makefile" ;;
   "../Cantera/python/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../Cantera/python/src/Makefile" ;;
   "../ext/lapack/Makefile" ) CONFIG_FILES="$CONFIG_FILES ../ext/lapack/Makefile" ;;
diff --git a/config/configure.in b/config/configure.in
index 2e595851c..31d864274 100755
--- a/config/configure.in
+++ b/config/configure.in
@@ -142,10 +142,17 @@ AC_DEFINE_UNQUOTED(CANTERA_ROOT,"$prefix/cantera")
 if test -z "$MAKE"; then MAKE='make'; fi
 AC_SUBST(MAKE)
 
-#if test -z "$ARCHIVE"; then ARCHIVE='ar ruv'; fi
+#----------- ARCHIVE --------------------
+
+if test "x${OS_IS_DARWIN}" = "x1"; then
+ARCHIVE='libtool -static -o'
+fi
+
 AC_SUBST(ARCHIVE)
 
-#if test -z "$SOEXT"; then SOEXT='so'; fi
+#----------------------------------------
+
+
 AC_SUBST(SOEXT)
 
 if test -z "$SHARED"; then SHARED='-shared'; fi
@@ -496,7 +503,7 @@ AC_OUTPUT(../Cantera/Makefile \
           ../Cantera/matlab/setup_matlab.py \
 	  ../Cantera/python/Makefile \
           ../Cantera/python/setup.py \
-	  ../Cantera/cxx/Makefile \
+	  ../Cantera/cxx/src/Makefile \
 	  ../Cantera/user/Makefile \
 	  ../Cantera/python/src/Makefile \
           ../ext/lapack/Makefile \