diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 974d3719f..f7ce5e8f6 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-16  Alex Roitman  <shura@gramps-project.org>
+	* configure.in: Add HELPPATH and FONTPATH substitutions, generate
+	new files in help/output.
+
 2007-02-14  Brian Matherly  <brian@gramps-project.org>
 	* src/docgen/HtmlDoc.py: fix html template loading.
 	* src/ReportBase/_ReportDialog.py: fix html template loading.
diff --git a/gramps2/configure.in b/gramps2/configure.in
index e809bb336..faca1316d 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -44,6 +44,12 @@ AM_CONDITIONAL(ENABLE_SK, test "x$packager_mode" = "xfalse" -a "x$enable_scrollk
 AC_SUBST(RELEASE)
 AC_SUBST(VERSIONSTRING)
 
+dnl These are needed for the full paths for the manual output
+HELPPATH=$(pwd)/help/output
+FONTPATH=/usr/share/fonts/truetype/freefont
+AC_SUBST(HELPPATH)
+AC_SUBST(FONTPATH)
+
 dnl Add the languages which your application supports here.
 ALL_LINGUAS="hu zh_CN cs da de es fr it nb nl no pl pt_BR ro ru sv eo fi lt sk tr"
 GETTEXT_PACKAGE=gramps
@@ -194,6 +200,8 @@ AC_CONFIG_FILES([
 po/Makefile.in
 m4/Makefile
 help/Makefile
+help/output/Makefile
+help/output/grampsfop.xconf
 Makefile
 gramps.spec
 gramps.sh
diff --git a/gramps2/help/ChangeLog b/gramps2/help/ChangeLog
index 0a26714a7..5664b81e0 100644
--- a/gramps2/help/ChangeLog
+++ b/gramps2/help/ChangeLog
@@ -1,6 +1,7 @@
 2007-02-16  Alex Roitman  <shura@gramps-project.org>
 	* help/nl: Add svn:ignore property.
 	* various: Add stuff for generating html and pdf output.
+	* Makefile.am (SUBDIRS): Add subdirs.
 
 2007-02-13  Lubo Vasko  <pgval@inMail.sk>
 	* sk/figures/*.png : Update.
diff --git a/gramps2/help/Makefile.am b/gramps2/help/Makefile.am
index 799aa3359..f61236255 100644
--- a/gramps2/help/Makefile.am
+++ b/gramps2/help/Makefile.am
@@ -1,6 +1,8 @@
 # This is the help level Makefile for gramps
 # $Id$
 
+SUBDIRS = output
+
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
diff --git a/gramps2/help/output/Makeflie.am b/gramps2/help/output/Makeflie.am
new file mode 100644
index 000000000..b58e5a6e8
--- /dev/null
+++ b/gramps2/help/output/Makeflie.am
@@ -0,0 +1,6 @@
+# This is the help/output level Makefile for gramps
+# $Id$
+
+html: /bin/true && "This is a placeholder"
+
+pdf: /bin/true && "This is a placeholder"
diff --git a/gramps2/help/output/grampsfop.xconf b/gramps2/help/output/grampsfop.xconf
deleted file mode 100644
index 579c345c0..000000000
--- a/gramps2/help/output/grampsfop.xconf
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-
-<fop version="1.0">
-
-  <!-- Source resolution in dpi (dots/pixels per inch) for 
-     determining the size of pixels in SVG and bitmap images, 
-     default: 72dpi -->
-  <source-resolution>72</source-resolution>
-  <!-- Target resolution in dpi (dots/pixels per inch) for 
-     specifying the target resolution for generated bitmaps, 
-     default: 72dpi -->
-  <target-resolution>72</target-resolution>
- 
-  <renderers>
-    <renderer mime="application/pdf">
-       <fonts>
-        <!-- embedded fonts -->
-        <!--
-        This information must exactly match the font specified
-        in the fo file. Otherwise it will use a default font.
-        -->
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeSerif.xml"
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeSerif.ttf">
-          <font-triplet name="FreeSerif" style="normal" weight="normal"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeSerifBold.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeSerifBold.ttf">
-          <font-triplet name="FreeSerif" style="normal" weight="bold"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeSerifItalic.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeSerifItalic.ttf">
-          <font-triplet name="FreeSerif" style="italic" weight="normal"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeSerifBoldItalic.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeSerifBoldItalic.ttf">
-          <font-triplet name="FreeSerif" style="italic" weight="bold"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeMono.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeMono.ttf">
-          <font-triplet name="FreeMono" style="normal" weight="normal"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeMonoBold.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeMonoBold.ttf">
-          <font-triplet name="FreeMono" style="normal" weight="bold"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeMonoOblique.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeMonoOblique.ttf">
-          <font-triplet name="FreeMono" style="italic" weight="normal"/>
-        </font>
-        <font metrics-url="file:///home/benny/programms/gramps/gramps2/data/help/FreeMonoBoldOblique.xml" 
-          kerning="yes" embed-url="file:///usr/share/fonts/truetype/freefont/FreeMonoBoldOblique.ttf">
-          <font-triplet name="FreeMono" style="italic" weight="bold"/>
-        </font>
-      </fonts>
-    </renderer>
-  </renderers>
-
-</fop>
\ No newline at end of file
diff --git a/gramps2/help/output/grampsfop.xconf.in b/gramps2/help/output/grampsfop.xconf.in
new file mode 100644
index 000000000..cf93b1115
--- /dev/null
+++ b/gramps2/help/output/grampsfop.xconf.in
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<fop version="1.0">
+
+  <!-- Source resolution in dpi (dots/pixels per inch) for 
+     determining the size of pixels in SVG and bitmap images, 
+     default: 72dpi -->
+  <source-resolution>72</source-resolution>
+  <!-- Target resolution in dpi (dots/pixels per inch) for 
+     specifying the target resolution for generated bitmaps, 
+     default: 72dpi -->
+  <target-resolution>72</target-resolution>
+ 
+  <renderers>
+    <renderer mime="application/pdf">
+       <fonts>
+        <!-- embedded fonts -->
+        <!--
+        This information must exactly match the font specified
+        in the fo file. Otherwise it will use a default font.
+        -->
+        <font metrics-url="file://@HELPPATH@/FreeSerif.xml"
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerif.ttf">
+          <font-triplet name="FreeSerif" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifBold.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifBold.ttf">
+          <font-triplet name="FreeSerif" style="normal" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifItalic.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifItalic.ttf">
+          <font-triplet name="FreeSerif" style="italic" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeSerifBoldItalic.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeSerifBoldItalic.ttf">
+          <font-triplet name="FreeSerif" style="italic" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMono.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMono.ttf">
+          <font-triplet name="FreeMono" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoBold.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoBold.ttf">
+          <font-triplet name="FreeMono" style="normal" weight="bold"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoOblique.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoOblique.ttf">
+          <font-triplet name="FreeMono" style="italic" weight="normal"/>
+        </font>
+        <font metrics-url="file://@HELPPATH@/FreeMonoBoldOblique.xml" 
+          kerning="yes" embed-url="file://@FONTPATH@/FreeMonoBoldOblique.ttf">
+          <font-triplet name="FreeMono" style="italic" weight="bold"/>
+        </font>
+      </fonts>
+    </renderer>
+  </renderers>
+
+</fop>
\ No newline at end of file