diff --git a/Makefile.am b/Makefile.am
index 1370a0f306..636174f1b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,6 +37,16 @@ pkginclude_HEADERS = \
     config.h \
     version.h
 
+# Add a stage target for staging a distribution
+
+clean-generic:
+	rm -rf stage
+
+stage: all
+	if [ ! -d stage ] ; then mkdir stage ; fi
+	rm -rf stage/*
+	$(MAKE) DESTDIR=$(PWD)/stage install
+
 dist-hook:
 	rm -rf `find $(distdir) -name .backup -prune -o -name '*~' -o -name CVS`
 #	cd $(distdir) && ./_autosetup
diff --git a/checkin_notes b/checkin_notes
index d459700282..d060c8a8bf 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4433,3 +4433,11 @@ Eric    May 28 2008
         icons/
             Makefile.am
             boincmgr.{16x16,32x32,48x48}.png
+
+Eric	May 28 2008
+    - Added a stage target for staging a distribution.
+      Executing "make stage" will "make all" and will install the client
+      under the stage directory (i.e. binaries is stage/$(prefix)/bin, libraries
+      in stage/$(prefix)/lib, etc)
+
+    Makefile.am