diff --git a/checkin_notes b/checkin_notes
index 061538ae47..150d6321a3 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5338,3 +5338,14 @@ David  11 June 2009
         parse_config
         xadd
         update_versions
+
+David  11 June 2009
+    - server: Use distutils for installing the python modules,
+        and move files not part of the BOINC package from py/Boinc to py/
+        From Gabor Gombas.
+
+    configure.ac
+    py/
+        Makefile.am
+        boinc_path_config.py.in (moved here)
+        db_def_to_py (moved here)
diff --git a/configure.ac b/configure.ac
index 7a90dc4540..bd95088984 100644
--- a/configure.ac
+++ b/configure.ac
@@ -854,7 +854,7 @@ AC_CONFIG_FILES([
                  clientgui/Makefile
                  clientgui/res/Makefile
                  client/Makefile
-                 client/win/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 client/win/boinc_path_config.py:py/boinc_path_config.py.in
 		 client/scripts/Makefile
 		 client/scripts/boinc-client
                  db/Makefile
@@ -863,12 +863,11 @@ AC_CONFIG_FILES([
                  lib/Makefile
 		 locale/Makefile
                  Makefile
-                 py/Boinc/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
-                 py/Boinc/Makefile
-                 py/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
                  py/Boinc/version.py
                  py/Makefile
-                 sched/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 py/boinc_path_config.py:py/boinc_path_config.py.in
+		 py/setup.py
+                 sched/boinc_path_config.py:py/boinc_path_config.py.in
                  sched/Makefile
                  packages/generic/sea/Makefile
                  packages/solaris/CSW/Makefile
@@ -884,10 +883,10 @@ AC_CONFIG_FILES([
                  packages/solaris/CSW/boincmanager/Makefile
                  packages/solaris/CSW/boincmanager/pkginfo
                  packages/solaris/CSW/boincmanager/prototype
-                 test/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 test/boinc_path_config.py:py/boinc_path_config.py.in
                  test/Makefile
                  test/version.inc
-                 tools/boinc_path_config.py:py/Boinc/boinc_path_config.py.in
+                 tools/boinc_path_config.py:py/boinc_path_config.py.in
                  tools/Makefile
                  zip/Makefile
                  zip/zip/Makefile
diff --git a/py/Boinc/Makefile.am b/py/Boinc/Makefile.am
deleted file mode 100644
index 87e0c120ad..0000000000
--- a/py/Boinc/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-## -*- mode: makefile; tab-width: 4 -*-
-## $Id$
-
-include $(top_srcdir)/Makefile.incl
-
-EXTRA_DIST = db_def_to_py				\
-	__init__.py					\
-	add_util.py					\
-	boinc_db.py					\
-	boinc_project_path.py				\
-	boincxml.py					\
-	configxml.py					\
-	database.py					\
-	db_base.py					\
-	db_mid.py					\
-	projectxml.py					\
-	sched_messages.py				\
-	setup_project.py				\
-	tools.py					\
-	util.py
-
-$(srcdir)/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/result_state.h
-	cat $^ | $(srcdir)/db_def_to_py > $@
-
-# all: $(srcdir)/boinc_db.py
diff --git a/py/Makefile.am b/py/Makefile.am
index 8a183171ac..5d69b4e775 100644
--- a/py/Makefile.am
+++ b/py/Makefile.am
@@ -1,4 +1,31 @@
 ## -*- mode: makefile; tab-width: 4 -*-
 ## $Id$
 
-SUBDIRS = Boinc
+include $(top_srcdir)/Makefile.incl
+
+EXTRA_DIST = db_def_to_py \
+	Boinc/__init__.py \
+	Boinc/add_util.py \
+	Boinc/boinc_db.py \
+	Boinc/boinc_project_path.py \
+	Boinc/boincxml.py \
+	Boinc/configxml.py \
+	Boinc/database.py \
+	Boinc/db_base.py \
+	Boinc/db_mid.py	 \
+	Boinc/projectxml.py \
+	Boinc/sched_messages.py \
+	Boinc/setup_project.py \
+	Boinc/tools.py \
+	Boinc/util.py
+
+$(srcdir)/Boinc/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/common_defs.h
+	cat $^ | $(top_srcdir)/py/db_def_to_py > $@
+
+# all: $(srcdir)/Boinc/boinc_db.py
+
+all-local:
+	python setup.py build --build-base=$(top_builddir)/py
+
+install-exec-local:
+	python setup.py install --prefix=$(prefix) --root=$(DESTDIR)
diff --git a/py/Boinc/boinc_path_config.py.in b/py/boinc_path_config.py.in
similarity index 100%
rename from py/Boinc/boinc_path_config.py.in
rename to py/boinc_path_config.py.in
diff --git a/py/Boinc/db_def_to_py b/py/db_def_to_py
similarity index 100%
rename from py/Boinc/db_def_to_py
rename to py/db_def_to_py