diff -Naurp foo2zjs/foo2hp2600-wrapper.1in foo2zjs.oden/foo2hp2600-wrapper.1in
--- foo2zjs/foo2hp2600-wrapper.1in	2008-12-07 01:08:42.000000000 +0100
+++ foo2zjs.oden/foo2hp2600-wrapper.1in	2009-02-11 19:20:29.000000000 +0100
@@ -168,7 +168,7 @@ etc.  This option may appear more than o
 .TP
 .BI \-G\0 profile.icm
 Convert \fIprofile.icm\fP to a Postscript color rendering
-dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and
+dictionary (CRD) using \fBicc2ps\fP and
 adjust the printer colors by using the Postscript \fBsetcolorrendering\fP
 operator.  If \fIprofile.icm\fP is none.icm, then prepare for ordering a
 ICM custom printer profile (i.e. from www.ICCFactory.com).
diff -Naurp foo2zjs/foo2hp2600-wrapper.in foo2zjs.oden/foo2hp2600-wrapper.in
--- foo2zjs/foo2hp2600-wrapper.in	2008-12-07 01:45:18.000000000 +0100
+++ foo2zjs.oden/foo2hp2600-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -585,7 +585,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
 	case "$GAMMAFILE" in
 	none.icm | */none.icm)
diff -Naurp foo2zjs/foo2lava-wrapper.1in foo2zjs.oden/foo2lava-wrapper.1in
--- foo2zjs/foo2lava-wrapper.1in	2009-01-21 04:30:34.000000000 +0100
+++ foo2zjs.oden/foo2lava-wrapper.1in	2009-02-11 19:20:29.000000000 +0100
@@ -154,7 +154,7 @@ etc.  This option may appear more than o
 .TP
 .BI \-G\0 profile.icm
 Convert \fIprofile.icm\fP to a Postscript color rendering
-dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and
+dictionary (CRD) using \fBicc2ps\fP and
 adjust the printer colors by using the Postscript \fBsetcolorrendering\fP
 operator.  (WORK IN PROGRESS).
 .TP
diff -Naurp foo2zjs/foo2lava-wrapper.in foo2zjs.oden/foo2lava-wrapper.in
--- foo2zjs/foo2lava-wrapper.in	2009-01-21 08:52:13.000000000 +0100
+++ foo2zjs.oden/foo2lava-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -510,7 +510,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
         case "$GAMMAFILE" in
         none.icm | */none.icm)
diff -Naurp foo2zjs/foo2oak-wrapper.1in foo2zjs.oden/foo2oak-wrapper.1in
--- foo2zjs/foo2oak-wrapper.1in	2008-05-03 16:25:31.000000000 +0200
+++ foo2zjs.oden/foo2oak-wrapper.1in	2009-02-11 19:20:29.000000000 +0100
@@ -153,7 +153,7 @@ etc.  This option may appear more than o
 .TP
 .BI \-G\0 profile.icm
 Convert \fIprofile.icm\fP to a Postscript color rendering
-dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and
+dictionary (CRD) using \fBicc2ps\fP and
 adjust the printer colors by using the Postscript \fBsetcolorrendering\fP
 operator.  (WORK IN PROGRESS).
 .TP
diff -Naurp foo2zjs/foo2oak-wrapper.in foo2zjs.oden/foo2oak-wrapper.in
--- foo2zjs/foo2oak-wrapper.in	2009-01-11 13:21:46.000000000 +0100
+++ foo2zjs.oden/foo2oak-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -527,7 +527,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
 	case "$GAMMAFILE" in
 	none | none.icm | */none.icm)
diff -Naurp foo2zjs/foo2qpdl-wrapper.1in foo2zjs.oden/foo2qpdl-wrapper.1in
--- foo2zjs/foo2qpdl-wrapper.1in	2009-01-21 04:13:21.000000000 +0100
+++ foo2zjs.oden/foo2qpdl-wrapper.1in	2009-02-11 19:20:29.000000000 +0100
@@ -156,7 +156,7 @@ etc.  This option may appear more than o
 .TP
 .BI \-G\0 profile.icm
 Convert \fIprofile.icm\fP to a Postscript color rendering
-dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and
+dictionary (CRD) using \fBicc2ps\fP and
 adjust the printer colors by using the Postscript \fBsetcolorrendering\fP
 operator.  (WORK IN PROGRESS).
 .TP
diff -Naurp foo2zjs/foo2qpdl-wrapper.in foo2zjs.oden/foo2qpdl-wrapper.in
--- foo2zjs/foo2qpdl-wrapper.in	2009-01-21 08:52:13.000000000 +0100
+++ foo2zjs.oden/foo2qpdl-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -496,7 +496,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
 	case "$GAMMAFILE" in
 	none | none.icm | */none.icm)
diff -Naurp foo2zjs/foo2xqx-wrapper.in foo2zjs.oden/foo2xqx-wrapper.in
--- foo2zjs/foo2xqx-wrapper.in	2008-02-16 16:30:20.000000000 +0100
+++ foo2zjs.oden/foo2xqx-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -453,7 +453,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
 	$ICC2PS -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps 2>$ICCTMP.log \
 	|| error "Problem converting .ICM file to Postscript"
diff -Naurp foo2zjs/foo2zjs-wrapper.1in foo2zjs.oden/foo2zjs-wrapper.1in
--- foo2zjs/foo2zjs-wrapper.1in	2009-01-21 04:31:07.000000000 +0100
+++ foo2zjs.oden/foo2zjs-wrapper.1in	2009-02-11 19:20:29.000000000 +0100
@@ -163,7 +163,7 @@ etc.  This option may appear more than o
 .TP
 .BI \-G\0 profile.icm
 Convert \fIprofile.icm\fP to a Postscript color rendering
-dictionary (CRD) using \fBfoo2zjs-icc2ps\fP and
+dictionary (CRD) using \fBicc2ps\fP and
 adjust the printer colors by using the Postscript \fBsetcolorrendering\fP
 operator.  (WORK IN PROGRESS).
 .TP
diff -Naurp foo2zjs/foo2zjs-wrapper.in foo2zjs.oden/foo2zjs-wrapper.in
--- foo2zjs/foo2zjs-wrapper.in	2009-01-22 21:56:35.000000000 +0100
+++ foo2zjs.oden/foo2zjs-wrapper.in	2009-02-11 19:20:29.000000000 +0100
@@ -521,7 +521,7 @@ create_crd() {
     #
     # Create a Postscript CRD
     #
-    ICC2PS=$PREFIX/bin/foo2zjs-icc2ps
+    ICC2PS=$PREFIX/bin/icc2ps
     if [ -x $ICC2PS ]; then
 	case "$GAMMAFILE" in
 	none | none.icm | */none.icm)
diff -Naurp foo2zjs/Makefile foo2zjs.oden/Makefile
--- foo2zjs/Makefile	2009-01-22 21:37:22.000000000 +0100
+++ foo2zjs.oden/Makefile	2009-02-11 19:22:04.000000000 +0100
@@ -178,12 +178,6 @@ FILES	=	\
 		foomatic-db/*/*.xml \
 		foomatic-test \
 		getweb.in \
-		icc2ps/*.[ch] \
-		icc2ps/Makefile \
-		icc2ps/AUTHORS \
-		icc2ps/COPYING \
-		icc2ps/README \
-		icc2ps/README.foo2zjs \
 		ppd-adjust \
 		PPD/*.ppd \
 		crd/zjs/*.crd \
@@ -333,7 +327,7 @@ JBGOPTS=-m 16 -d 0 -p 92	# Equivalent op
 #
 # The usual build rules
 #
-all:	all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb all-icc2ps man doc \
+all:	all-test $(PROGS) $(BINPROGS) $(SHELLS) getweb man doc \
 	all-done
 
 all-test:
@@ -462,9 +456,6 @@ getweb: getweb.in Makefile
 	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
 	chmod 555 $@
 
-all-icc2ps:
-	cd icc2ps; $(MAKE) all
-
 ok: ok.o $(LIBJBG)
 	$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
 
@@ -501,7 +492,7 @@ gipddecode: gipddecode.o $(LIBJBG)
 #
 # Installation rules
 #
-install: all install-test install-prog install-icc2ps install-extra \
+install: all install-test install-prog install-extra \
 	    install-crd install-foo install-ppd \
 	    install-gui install-desktop \
 	    install-man install-doc
@@ -608,12 +599,6 @@ install-foo:
 	    foomatic-combo-xml -O >overview.xml; \
 	fi
 
-install-icc2ps:
-	#
-	# Install ICM to Postscript file conversion utility
-	#
-	cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install
-
 install-crd:
 	#
 	# Install prebuilt CRD files (from m2300w project)
@@ -895,7 +880,6 @@ uninstall:
 	-rm -f /usr/bin/hipercdecode
 	-rm -f /usr/bin/opldecode
 	-rm -f /usr/bin/rodecode
-	-rm -f /usr/bin/foo2zjs-icc2ps
 	-rm -f /usr/bin/foo2zjs-pstops
 	-rm -f /usr/share/applications/hplj1020.desktop
 	-rm -f /usr/share/pixmaps/hplj1020_icon.png
@@ -934,7 +918,6 @@ clean:
 	-rm -f *.zjs *.zm *.zc *.zc? *.zc?? *.oak *.pbm *.pksm *.cmyk
 	-rm -f pksm2bitcmyk
 	-rm -f *.icm.*.ps
-	cd icc2ps; $(MAKE) $@
 
 #
 # Header dependencies
@@ -1079,7 +1062,7 @@ pprtest-3.oak: FRC
 #
 #	icc2ps regression tests
 #
-ICC2PS=./icc2ps/foo2zjs-icc2ps
+ICC2PS=/usr/bin/icc2ps
 icctest:
 	for g in *.icm; do \
 	    for i in 0 1 2 3; do \