diff --git a/eo/Makefile.am b/eo/Makefile.am
index e50528c3d..3b8a03006 100644
--- a/eo/Makefile.am
+++ b/eo/Makefile.am
@@ -4,7 +4,7 @@
##
###############################################################################
-SUBDIRS = src test win contrib
+SUBDIRS = src test win contrib doc
#Directory for documents
DOCDIR = ~/public_html/eodocs
#Directory for indices -- not useful for the user
diff --git a/eo/configure.in b/eo/configure.in
index 59e46f578..59e79ba89 100644
--- a/eo/configure.in
+++ b/eo/configure.in
@@ -12,4 +12,4 @@ AM_PROG_LIBTOOL
AM_MAINTAINER_MODE
dnl add Makefiles that must be modified by the configuration here
-AC_OUTPUT(Makefile src/Makefile src/es/Makefile src/ga/Makefile src/gp/Makefile src/obsolete/Makefile src/other/Makefile src/utils/Makefile test/Makefile win/Makefile doc/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/es/Makefile src/ga/Makefile src/gp/Makefile src/obsolete/Makefile src/other/Makefile src/utils/Makefile test/Makefile win/Makefile doc/Makefile contrib/Makefile)
diff --git a/eo/doc/Makefile.am b/eo/doc/Makefile.am
index d2936d58b..0f22bbdf5 100644
--- a/eo/doc/Makefile.am
+++ b/eo/doc/Makefile.am
@@ -5,3 +5,5 @@
###############################################################################
###############################################################################
+
+EXTRA_DIST = eo.cfg foot.html
\ No newline at end of file
diff --git a/eo/foot.html b/eo/foot.html
deleted file mode 100644
index f6efa307d..000000000
--- a/eo/foot.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- BinOp
-
-
-
-
-

-
-
-
-
-
diff --git a/eo/src/Makefile.am b/eo/src/Makefile.am
index dad358759..e1291ab8d 100644
--- a/eo/src/Makefile.am
+++ b/eo/src/Makefile.am
@@ -4,10 +4,10 @@
##
###############################################################################
-SUBDIRS = es ga gp obsolete utils # other
+SUBDIRS = es ga gp obsolete utils other
lib_LIBRARIES = libeo.a
libeo_a_SOURCES = eoPrintable.cpp eoPersistent.cpp
libeoincdir = $(includedir)/eo
-libeoinc_HEADERS = EO.h eoDup.h eoKill.h eoTournament.h eo1d.h eoEasyEA.h eoLottery.h eoProportionalOpSel.h eoTranspose.h eo1dWDistance.h eoEvalFunc.h eoMerge.h eoRandomBreed.h eoUniform.h eo2d.h eoEvalFuncPtr.h eoMutation.h eoRandomIndiSelector.h eoUniformSelect.h eo2dVector.h eoEvalFuncPtrCnt.h eoNegExp.h eoRandomSelect.h eoUniformXOver.h eoAlgo.h eoFactory.h eoNonUniform.h eoRank.h eoVector.h eoAtomBitFlip.h eoFitTerm.h eoNormal.h eoRnd.h eoWrappedOps.h eoAtomCreep.h eoFitness.h eoObject.h eoScalarFitness.h eoXOver2.h eoAtomMutation.h eoGOpBreeder.h eoOp.h eoScheme.h eoAtomMutator.h eoGOpSelector.h eoOpFactory.h eoSelectFactory.h eoBreeder.h eoID.h eoPersistent.h eoSteadyStateGeneration.h eoAtomRandom.h eoGenTerm.h eoOpSelMason.h eoSequentialGOpSelector.h eoBackInserter.h eoGeneration.h eoOpSelector.h eoSteadyStateEA.h eoDetTournament.h eoInclusion.h eoPop.h eoSteadyStateInserter.h eoDetTournamentIndiSelector.h eoIndiSelector.h eoPopOps.h eoStochTournament.h eoDetTournamentInserter.h eoInserter.h eoPrintable.h eoStochTournamentInserter.h eoDistance.h eoInsertion.h eoProportionalGOpSel.h eoTerm.h
+libeoinc_HEADERS = eo EO.h eoDup.h eoKill.h eoTournament.h eo1d.h eoEasyEA.h eoLottery.h eoProportionalOpSel.h eoTranspose.h eo1dWDistance.h eoEvalFunc.h eoMerge.h eoRandomBreed.h eoUniform.h eo2d.h eoEvalFuncPtr.h eoMutation.h eoRandomIndiSelector.h eoUniformSelect.h eo2dVector.h eoEvalFuncPtrCnt.h eoNegExp.h eoRandomSelect.h eoUniformXOver.h eoAlgo.h eoFactory.h eoNonUniform.h eoRank.h eoVector.h eoAtomBitFlip.h eoFitTerm.h eoNormal.h eoRnd.h eoWrappedOps.h eoAtomCreep.h eoFitness.h eoObject.h eoScalarFitness.h eoXOver2.h eoAtomMutation.h eoGOpBreeder.h eoOp.h eoScheme.h eoAtomMutator.h eoGOpSelector.h eoOpFactory.h eoSelectFactory.h eoBreeder.h eoID.h eoPersistent.h eoSteadyStateGeneration.h eoAtomRandom.h eoGenTerm.h eoOpSelMason.h eoSequentialGOpSelector.h eoBackInserter.h eoGeneration.h eoOpSelector.h eoSteadyStateEA.h eoDetTournament.h eoInclusion.h eoPop.h eoSteadyStateInserter.h eoDetTournamentIndiSelector.h eoIndiSelector.h eoPopOps.h eoStochTournament.h eoDetTournamentInserter.h eoInserter.h eoPrintable.h eoStochTournamentInserter.h eoDistance.h eoInsertion.h eoProportionalGOpSel.h eoTerm.h eoUpdater.h