diff --git a/ChangeLog b/ChangeLog
index 3c96165bb..1400fb4b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-09  Alex Roitman  <shura@gramps-project.org>
+	* src/Makefile.am: Clean byte-compiled files.
+	* src/DataViews/Makefile.am: Clean byte-compiled files.
+	* src/GrampsDb/Makefile.am: Clean byte-compiled files.
+	* src/Config/Makefile.am: Clean byte-compiled files.
+	* src/RelLib/Makefile.am: Clean byte-compiled files.
+	* src/Editors/Makefile.am: Clean byte-compiled files.
+	* src/plugins/Makefile.am: Clean byte-compiled files.
+	* src/ObjectSelector/Makefile.am: Clean byte-compiled files.
+	* src/TreeViews/Makefile.am: Clean byte-compiled files.
+	* src/Models/Makefile.am: Clean byte-compiled files.
+	* src/Mime/Makefile.am: Clean byte-compiled files.
+	* src/GrampsLogger/Makefile.am: Clean byte-compiled files.
+	* src/PluginUtils/Makefile.am: Clean byte-compiled files.
+	* src/docgen/Makefile.am: Clean byte-compiled files.
+	* src/DateHandler/Makefile.am: Clean byte-compiled files.
+
 2006-04-09  Don Allingham  <don@gramps-project.org>
 	* src/plugins/*: bring up to ManagedWindow
 
diff --git a/src/Config/Makefile.am b/src/Config/Makefile.am
index 67941c00b..3a1f7f65f 100644
--- a/src/Config/Makefile.am
+++ b/src/Config/Makefile.am
@@ -13,6 +13,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/Config
 pkgpythondir = @pkgpythondir@/Config
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/DataViews/Makefile.am b/src/DataViews/Makefile.am
index 9bec0cecd..66a2676ae 100644
--- a/src/DataViews/Makefile.am
+++ b/src/DataViews/Makefile.am
@@ -21,6 +21,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/DataViews
 pkgpythondir = @pkgpythondir@/DataViews
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/DateHandler/Makefile.am b/src/DateHandler/Makefile.am
index 65893010e..bcc90f9d6 100644
--- a/src/DateHandler/Makefile.am
+++ b/src/DateHandler/Makefile.am
@@ -22,6 +22,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/DateHandler
 pkgpythondir = @pkgpythondir@/DateHandler
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = ".."
 
 pycheck: 
diff --git a/src/Editors/Makefile.am b/src/Editors/Makefile.am
index a9e4fc76d..0b532b890 100644
--- a/src/Editors/Makefile.am
+++ b/src/Editors/Makefile.am
@@ -31,6 +31,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/Editors
 pkgpythondir = @pkgpythondir@/Editors
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/GrampsDb/Makefile.am b/src/GrampsDb/Makefile.am
index 4c88c604f..7039265d6 100644
--- a/src/GrampsDb/Makefile.am
+++ b/src/GrampsDb/Makefile.am
@@ -35,6 +35,9 @@ GLADEFILES = \
 
 dist_pkgdata_DATA = $(GLADEFILES) 
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/GrampsLogger/Makefile.am b/src/GrampsLogger/Makefile.am
index f7ee844f2..75399fc48 100644
--- a/src/GrampsLogger/Makefile.am
+++ b/src/GrampsLogger/Makefile.am
@@ -15,6 +15,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/GrampsLogger
 pkgpythondir = @pkgpythondir@/GrampsLogger
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/Makefile.am b/src/Makefile.am
index f6b6af605..5c43a2aef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,25 +20,8 @@ SUBDIRS = \
 	images \
 	plugins
 
-# For intl. support, how do we compile?
-MOSTLYCLEANFILES = 
-CLEANFILES = const.pyc const.pyo
-
-# What are the PYTHON scripts for this package that need to be handled?
-#
-# We only want optimized byte-compiled (.pyo) versions, no .pyc
-# In principle, this is handled by PYCFILES and PYOFILES, but
-# they don't seem to work so we edited the py-compile script instead
-
 gdirdir=$(prefix)/share/gramps
 
-docfiles = \
-	RelLib.py \
-	Date.py \
-	DateParser.py \
-	DateDisplay.py \
-	GrampsDbBase.py 
-
 gdir_PYTHON = \
 	AddMedia.py\
 	ansel_utf8.py\
@@ -96,6 +79,12 @@ gdir_PYTHON = \
 	SelectFamily.py\
 	SelectSource.py
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
+# Which modules to document
+docmodules = RelLib DateHandler GrampsDb
+
 pycheck: 
 	for d in $(SUBDIRS) ; do \
           (cd $$d; make pycheck); \
@@ -103,8 +92,8 @@ pycheck:
 	pychecker $(gdir_PYTHON)
 
 docs:
-	epydoc -o doc --url http://gramps.sourceforge.net --name GRAMPS --html $(docfiles)
-	epydoc --pdf $(docfiles)
+	epydoc -o doc --url http://gramps.sourceforge.net --name GRAMPS --html $(docmodules)
+	epydoc --pdf $(docmodules)
 
 cmdplug:
 	./build_cmdplug
diff --git a/src/Mime/Makefile.am b/src/Mime/Makefile.am
index 75247fb3e..5a041a761 100644
--- a/src/Mime/Makefile.am
+++ b/src/Mime/Makefile.am
@@ -13,6 +13,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/Mime
 pkgpythondir = @pkgpythondir@/Mime
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/Models/Makefile.am b/src/Models/Makefile.am
index ecce8630a..e4cdc12ca 100644
--- a/src/Models/Makefile.am
+++ b/src/Models/Makefile.am
@@ -18,6 +18,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/Models
 pkgpythondir = @pkgpythondir@/Models
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/ObjectSelector/Makefile.am b/src/ObjectSelector/Makefile.am
index ca1861840..061023ba0 100644
--- a/src/ObjectSelector/Makefile.am
+++ b/src/ObjectSelector/Makefile.am
@@ -28,6 +28,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/ObjectSelector
 pkgpythondir = @pkgpythondir@/ObjectSelector
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck:
diff --git a/src/PluginUtils/Makefile.am b/src/PluginUtils/Makefile.am
index d09225d40..2a15ccfe0 100644
--- a/src/PluginUtils/Makefile.am
+++ b/src/PluginUtils/Makefile.am
@@ -20,6 +20,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/PluginUtils
 pkgpythondir = @pkgpythondir@/PluginUtils
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/RelLib/Makefile.am b/src/RelLib/Makefile.am
index bbdd30aea..eccaaf616 100644
--- a/src/RelLib/Makefile.am
+++ b/src/RelLib/Makefile.am
@@ -48,6 +48,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/RelLib
 pkgpythondir = @pkgpythondir@/RelLib
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/TreeViews/Makefile.am b/src/TreeViews/Makefile.am
index 0cb6b05a6..ed4eee0d1 100644
--- a/src/TreeViews/Makefile.am
+++ b/src/TreeViews/Makefile.am
@@ -12,6 +12,9 @@ pkgdata_PYTHON = \
 pkgpyexecdir = @pkgpyexecdir@/TreeViews
 pkgpythondir = @pkgpythondir@/TreeViews
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am
index 5a89e0e59..f7aaf416f 100644
--- a/src/docgen/Makefile.am
+++ b/src/docgen/Makefile.am
@@ -20,6 +20,9 @@ docgen_PYTHON = \
 	SvgDrawDoc.py\
 	LPRDoc.py
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../"
 
 pycheck: 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index c946f8586..cf07f5b0a 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -98,6 +98,9 @@ DATAFILES = \
 
 dist_pkgdata_DATA = $(GLADEFILES) $(GRAPHICS) $(DATAFILES)
 
+# Clean up all the byte-compiled files
+MOSTLYCLEANFILES = *pyc *pyo
+
 GRAMPS_PY_MODPATH = "../:../docgen"
 
 pycheck: