diff --git a/Makefile.am b/Makefile.am
index dd5e33329..c82503591 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#include $(top_srcdir)/doxygen/aminclude.am
+include $(top_srcdir)/doxygen/aminclude.am
 
 # Build in these directories:
 SUBDIRS  = Cantera examples test_problems
diff --git a/configure.ac b/configure.ac
index f40581b8f..f13b359aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,8 @@ DX_PS_FEATURE(OFF)
 DX_INIT_DOXYGEN(cantera, doxygen/cantera.dox, docs) 
 
 # Generate Output Files
-AC_OUTPUT(Makefile test_problems/Makefile examples/Makefile                \
+AC_OUTPUT(Makefile examples/Makefile                                       \
+                   test_problems/Makefile                                  \
 		   doxygen/Makefile                                        \
 		   Cantera/Makefile                                        \
                    Cantera/src/Makefile Cantera/src/base/Makefile          \
diff --git a/test_problems/Makefile.am b/test_problems/Makefile.am
index a7919df96..18b0f0722 100644
--- a/test_problems/Makefile.am
+++ b/test_problems/Makefile.am
@@ -1,3 +1,21 @@
+
+SUBDIRS    = cxx_ex surfkin fracCoeff silane_equil VPsilance_test \
+	     negATest diamondSurf diamondSurf_dupl surfSolverTest \
+             ChemEquil_gri_matrix ChemEquil_gri_pairs             \
+             ChemEquil_ionizedGas ChemEquil_red1 CpJump           \
+	     mixGasTransport multiGasTransport printUtilUnitTest 
+
+#
+# would be good to add:
+#
+# pureFluidTest
+# rankine_democxx
+# min_python
+# ck2cti_test
+# nasa9_reader
+# cathermo
+# VCSnonideal
+
 EXTRA_DIST =
 
 dist-hook: