diff --git a/glafp-utils/docbook/Makefile b/glafp-utils/docbook/Makefile
index 206c5abfa2fb22fade6b9e0ebf302f98fd2154e7..724e437b1b6ab505bd46ea19a8f6352a5ff497bf 100644
--- a/glafp-utils/docbook/Makefile
+++ b/glafp-utils/docbook/Makefile
@@ -1,14 +1,6 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SCRIPT_PROG=db2html
-SCRIPT_OBJS=db2html.sh
-SCRIPT_SUBST_VARS=HTML_DIR
-INTERP=$(SHELL)
-
-HTML_DIR=$(FPTOOLS_TOP_ABS)/glafp-utils/docbook
-
-CLEAN_FILES += $(SCRIPT_PROG)
-DESTDIR=$(INSTSCRIPTDIR)
+SUBDIRS = db2dvi.dir db2html.dir db2pdf.dir db2ps.dir db2rtf.dir
 
 include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2dvi.dir/Makefile b/glafp-utils/docbook/db2dvi.dir/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..cc2ca2fe07111bb23abb993629af85973e1f84eb
--- /dev/null
+++ b/glafp-utils/docbook/db2dvi.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2dvi
+SCRIPT_OBJS=db2dvi.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2dvi b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
similarity index 93%
rename from glafp-utils/docbook/db2dvi
rename to glafp-utils/docbook/db2dvi.dir/db2dvi.sh
index e18bc5ecd9989c9a3d04bb7821e6bc2626b6b190..1450ce13aac5f5c80ac5cce4c86ccea2caf15cfd 100644
--- a/glafp-utils/docbook/db2dvi
+++ b/glafp-utils/docbook/db2dvi.dir/db2dvi.sh
@@ -32,7 +32,7 @@ echo OUTPUT FILE NAME IS $output
 
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
-jade -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
 
 jadetex ${TMPFN}.tex
 
diff --git a/glafp-utils/docbook/db2html.dir/Makefile b/glafp-utils/docbook/db2html.dir/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..4ac0374fe91acd93d2edeb4f2aaa741b5072845d
--- /dev/null
+++ b/glafp-utils/docbook/db2html.dir/Makefile
@@ -0,0 +1,14 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2html
+SCRIPT_OBJS=db2html.sh
+SCRIPT_SUBST_VARS=JADE HTML_DIR
+INTERP=$(SHELL)
+
+HTML_DIR=$(FPTOOLS_TOP_ABS)/glafp-utils/docbook
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2html.sh b/glafp-utils/docbook/db2html.dir/db2html.sh
similarity index 100%
rename from glafp-utils/docbook/db2html.sh
rename to glafp-utils/docbook/db2html.dir/db2html.sh
diff --git a/glafp-utils/docbook/db2pdf.dir/Makefile b/glafp-utils/docbook/db2pdf.dir/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..90678808ffa06e316a1336485d994bb3ad8c543f
--- /dev/null
+++ b/glafp-utils/docbook/db2pdf.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2pdf
+SCRIPT_OBJS=db2pdf.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2pdf b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
similarity index 88%
rename from glafp-utils/docbook/db2pdf
rename to glafp-utils/docbook/db2pdf.dir/db2pdf.sh
index 1c1e5dc5452e0ef230502ae83c8be5063bec892c..2d0b4cc7cc36d958a0b8a8e1af3b3fd966f1ba27 100644
--- a/glafp-utils/docbook/db2pdf
+++ b/glafp-utils/docbook/db2pdf.dir/db2pdf.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 TMPFN=`echo $1 | sed 's/\.sgml//'`
 
 # Dave Mason's option to specify a different stylesheet
@@ -30,9 +28,9 @@ then
   fi
 fi
 
-jade -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
+$JADE -t tex -d ${DB_STYLESHEET}\#print -o ${TMPFN}.tex $1
 
-pdfjadetex $TMPFN
+pdf$JADEtex $TMPFN
 
 if egrep '^LaTeX Warning: There were undefined references.$' ${TMPFN}.log >/dev/null 2>&1
 then
diff --git a/glafp-utils/docbook/db2ps.dir/Makefile b/glafp-utils/docbook/db2ps.dir/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..9bfcdbcf7d7639296811ff528454b85460a16aa0
--- /dev/null
+++ b/glafp-utils/docbook/db2ps.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2ps
+SCRIPT_OBJS=db2ps.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2ps b/glafp-utils/docbook/db2ps.dir/db2ps.sh
similarity index 98%
rename from glafp-utils/docbook/db2ps
rename to glafp-utils/docbook/db2ps.dir/db2ps.sh
index 9cbe5f4087a07d2457317bc383b4d22e8ecc6d9b..30e596510f31e96520faa34dbddcab4e7b2c1273 100644
--- a/glafp-utils/docbook/db2ps
+++ b/glafp-utils/docbook/db2ps.dir/db2ps.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 TMPFN=db2pstmp$$
 
 if [ $# -gt 2 ]
diff --git a/glafp-utils/docbook/db2rtf.dir/Makefile b/glafp-utils/docbook/db2rtf.dir/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..92669f48d7153226856629804d410242cc99a15a
--- /dev/null
+++ b/glafp-utils/docbook/db2rtf.dir/Makefile
@@ -0,0 +1,12 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SCRIPT_PROG=../db2rtf
+SCRIPT_OBJS=db2rtf.sh
+SCRIPT_SUBST_VARS=JADE
+INTERP=$(SHELL)
+
+CLEAN_FILES += $(SCRIPT_PROG)
+DESTDIR=$(INSTSCRIPTDIR)
+
+include $(TOP)/mk/target.mk
diff --git a/glafp-utils/docbook/db2rtf b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
similarity index 83%
rename from glafp-utils/docbook/db2rtf
rename to glafp-utils/docbook/db2rtf.dir/db2rtf.sh
index 98128740e8fcef4cf087a09d9cea7b89c9e27696..13535542d281c70dac34625e52c185894188ab9e 100644
--- a/glafp-utils/docbook/db2rtf
+++ b/glafp-utils/docbook/db2rtf.dir/db2rtf.sh
@@ -1,5 +1,3 @@
-#! /bin/sh
-
 output=db2rtf.rtf
 
 # Dave Mason's option to specify a different stylesheet
@@ -30,13 +28,13 @@ then
   fi
 fi
 
-cat $* | jade -t rtf -d ${DB_STYLESHEET}\#print
+cat $* | $JADE -t rtf -d ${DB_STYLESHEET}\#print
 
 if [ $# -eq 1 ]
 then
-  mv jade-out.rtf $output
+  mv $JADE-out.rtf $output
 else
-  cat jade-out.rtf
+  cat $JADE-out.rtf
 fi
 
 exit 0