diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index b4fb45af6..7aeb962dd 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-22  Alex Roitman  <shura@gramps-project.org>
+	* Makefile.am (SUBDIRS): Add debian dir.
+	* configure.in: Generate debian/Makefile
+	* debian/Makefile.am: Add makefile to place the debian dir in the
+	released tarball.
+
 2006-07-21  Brian Matherly  <brian@gramps-project.org>
 	* src/ReportBase/_ReportUtils.py: fix modified birth string (bug # 266).
 
diff --git a/gramps2/Makefile.am b/gramps2/Makefile.am
index b6c78e281..2f3b3dbe7 100644
--- a/gramps2/Makefile.am
+++ b/gramps2/Makefile.am
@@ -1,7 +1,7 @@
 # This is the top level Makefile for Gramps
 # $Id$
 
-SUBDIRS = m4 po src data example help
+SUBDIRS = m4 po src data example help debian
 
 EXTRA_DIST = \
 	config.rpath autogen.sh gramps.spec.in gramps.spec \
diff --git a/gramps2/configure.in b/gramps2/configure.in
index a37a07053..1644ee75c 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -228,6 +228,7 @@ src/data/templates/Makefile
 data/Makefile
 data/man/Makefile
 data/man/fr/Makefile
+debian/Makefile
 example/Makefile
 example/gramps/Makefile
 ])
diff --git a/gramps2/debian/Makefile.am b/gramps2/debian/Makefile.am
new file mode 100644
index 000000000..63f27eaad
--- /dev/null
+++ b/gramps2/debian/Makefile.am
@@ -0,0 +1,8 @@
+# This is the debain dir level Makefile for Gramps
+# $Id$
+
+EXTRA_DIST = \
+	changelog compat control copyright \
+	gramps.dirs gramps.docs gramps-help.docs gramps.manpages \
+	gramps.menu gramps.postinst gramps.postrm gramps.prerm \
+	gramps.xpm README.Debian rules substvars