diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 5bda094ba..cf07711da 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/Makefile.am
+	* src/plugins/Makefile.am: ScratchPad moved folder.
+
 2005-08-17  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/RepositoryView.py: remove method now works again.
 	
diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am
index d2a3020ed..0d31e31a1 100644
--- a/gramps2/src/Makefile.am
+++ b/gramps2/src/Makefile.am
@@ -92,6 +92,7 @@ gdir_PYTHON = \
 	RelLib.py\
 	Report.py\
 	ReportUtils.py\
+	ScratchPad.py\
 	SelectChild.py\
 	SelectObject.py\
 	Sort.py\
@@ -134,7 +135,8 @@ GLADEFILES = \
 	gedcomexport.glade\
 	gedcomimport.glade\
 	plugins.glade\
-	rule.glade
+	rule.glade\
+	scratchpad.glade
 
 GRAPHICS = \
 	bad.png\
diff --git a/gramps2/src/plugins/Makefile.am b/gramps2/src/plugins/Makefile.am
index a684bc281..fcb5f8cf3 100644
--- a/gramps2/src/plugins/Makefile.am
+++ b/gramps2/src/plugins/Makefile.am
@@ -37,7 +37,6 @@ pkgdata_PYTHON = \
 	ReadPkg.py\
 	RelCalc.py\
 	ReorderIds.py\
-	ScratchPad.py\
 	SoundGen.py\
 	StatisticsChart.py\
 	Summary.py\
@@ -84,7 +83,6 @@ GLADEFILES = \
 	book.glade\
 	writeftree.glade\
 	genewebexport.glade\
-	scratchpad.glade\
     vcardexport.glade\
     vcalendarexport.glade