diff --git a/ChangeLog b/ChangeLog
index 864fdbef3..894562a9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-01-20 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
+        * src/ObjectSelector/Makefile.am: added automake stuff.
+	
 2006-01-20 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
         * src/ObjectSelector/_Constants.py, src/ObjectSelector/_Factories.py,
 	  src/ObjectSelector/_FamilyFilterFrame.py,src/ObjectSelector/_FamilyFrame.py,
diff --git a/configure.in b/configure.in
index e8e603e63..dc2ccee0b 100644
--- a/configure.in
+++ b/configure.in
@@ -230,6 +230,7 @@ Makefile
 src/Makefile
 src/const.py
 src/RelLib/Makefile
+src/ObjectSelector/Makefile
 src/GrampsDb/Makefile
 src/docgen/Makefile
 src/plugins/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 3f4e04322..edb7d0288 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 
 # This is the src level Makefile for Gramps
-SUBDIRS = docgen plugins dates data po GrampsDb RelLib
+SUBDIRS = docgen plugins dates data po GrampsDb RelLib ObjectSelector
 
 # For intl. support, how do we compile?
 MOSTLYCLEANFILES = 
diff --git a/src/ObjectSelector/Makefile.am b/src/ObjectSelector/Makefile.am
new file mode 100644
index 000000000..ef982f1d3
--- /dev/null
+++ b/src/ObjectSelector/Makefile.am
@@ -0,0 +1,35 @@
+# This is the src/RelLib level Makefile for Gramps
+# We could use GNU make's ':=' syntax for nice wildcard use,
+# but that is not necessarily portable.
+# If not using GNU make, then list all .py files individually
+
+pkgdatadir = $(datadir)/@PACKAGE@/ObjectSelector
+
+pkgdata_PYTHON = \
+	_Constants.py\
+	_Factories.py\
+	_FamilyFilterFrame.py\
+	_FamilyFrame.py\
+	_FamilyPreviewFrame.py\
+	_FamilyTreeFrame.py\
+	_FilterFrameBase.py\
+	_FilterSpec.py\
+	_FilterSpecBase.py\
+	_ObjectFrameBase.py\
+	_ObjectSelectorResult.py\
+	_ObjectSelectorWindow.py\
+	_PersonFilterFrame.py\
+	_PersonFilterSpec.py\
+	_PersonFrame.py\
+	_PersonPreviewFrame.py\
+	_PersonTreeFrame.py\
+	__init__.py
+
+pkgpyexecdir = @pkgpyexecdir@/ObjectSelector
+pkgpythondir = @pkgpythondir@/ObjectSelector
+
+GRAMPS_PY_MODPATH = "../"
+
+pycheck:
+        (export PYTHONPATH=$(GRAMPS_PY_MODPATH); \
+        pychecker $(pkgdata_PYTHON));