diff --git a/.cvsignore b/.cvsignore
index e073db9..15246b0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,5 @@ gs5.50-vflib-1.0.tar.gz
 gs550j1.tar.gz
 hp8xxs13.zip
 hpdj-2.6.tar.gz
+lxm3200-0.4.1-gs5.50-src.tar.gz
+print-4.0a3.tar.gz
diff --git a/ghostscript.spec b/ghostscript.spec
index 4d2819c..b0cd4fd 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -7,7 +7,7 @@ Name: ghostscript
 %define hpdjver 2.6
 %define md2kver 0.2a
 Version: 5.50
-Release: 8j1
+Release: 17
 License: GPL
 URL: http://gnu-gs.sourceforge.net/
 Group: Applications/Publishing
@@ -20,6 +20,8 @@ Source5: http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/gdevmd2k-%{md2kver}.tar.gz
 Source6: http://lcewww.et.tudelft.nl/~haver/cgi-bin/download/linux/epson740.tgz
 Source10: http://www.ldl.jaist.ac.jp/~akr/nonresearch/free-software/ghostscript/%{vflib}.tar.gz
 Source11: %{gsj}.tar.gz
+Source12: http://download.sourceforge.net/gimp-print/print-4.0a3.tar.gz
+Source13: http://www.geocities.com/dgordini/lxm3200-0.4.1-gs5.50-src.tar.gz
 Patch0: ghostscript-5.50-config.patch
 Patch1: gs5.50-rth.patch
 Patch3: gs5.50-hp8xx.patch
@@ -35,16 +37,19 @@ Patch10: ghostscript-5.50-configj.patch
 Patch11: ghostscript-5.50-cdj880.patch
 Patch12: ghostscript-5.50-bmp16m.patch
 Patch13: ghostscript-5.50-gcc296.patch
-Patch14: ghostscript-5.50-mkstemp-LD_RUN_PATH.patch
+Patch14: ghostscript-5.50-bug19212.patch
+Patch15: ghostscript-5.50-mkstemp-LD_RUN_PATH.patch
+Patch16: gs5.50-time.patch
 %if %{enable_japanese}
 Patch20: ghostscript-5.50-jisb.patch
 %endif
 Patch21: ghostscript-5.50-ps.patch
 Requires: urw-fonts >= 1.1, ghostscript-fonts
-BuildRequires: freetype-devel
+BuildPreReq: freetype-devel
 %if %{enable_japanese}
-BuildPreReq: VFlib2-devel cmpskit
-Requires: VFlib2, cmpskit >= 2
+BuildPreReq: VFlib2-devel
+Requires: VFlib2
+Requires: xtt-fonts
 %endif
 BuildRoot: /var/tmp/ghostscript-root
 
@@ -103,10 +108,39 @@ cat gdevmd2k-%{md2kver}/gdevmd2k.mak-5.50 >>contrib.mak
 perl -pi -e "s/^DEVICE_DEVS6=/DEVICE_DEVS6=md2k.dev md5k.dev /g" unix-gcc.mak
 
 %patch6 -p1 -b .lx7000
+
+# Add the stp driver from the gimp-print project
+tar xzvf %{SOURCE12}
+cd $(basename %{SOURCE12} | sed -e 's/.tar.gz//')/Ghost
+mv *.{c,h} ../..
+cat contrib.mak.addon >> ../../contrib.mak
+cd ../../
+perl -pi -e 's/^DEVICE_DEVS6=/DEVICE_DEVS6=stp.dev /g' unix-gcc.mak
+
+# add the lxm3270 driver
+tar xzvf %{SOURCE13}
+cd $(basename %{SOURCE13} | sed -e 's/.tar.gz//')
+mv *.c ../
+cd ..
+perl -pi -e 's/^DEVICE_DEVS6=/DEVICE_DEVS6=lxm3200.dev /g' unix-gcc.mak
+echo '
+### ---------------- Lexmark 3200 device ----------------- ###
+
+lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
+
+$(GLOBJ)gdevlx32.$(OBJ): gdevlx32.c $(PDEVH) $(gsparam_h)
+	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
+
+lxm3200.dev: $(lxm3200_) page.dev
+	$(SETPDEV) lxm3200 $(lxm3200_)
+
+' >> contrib.mak
+
 %patch12 -p1 -b .bmp16m
 %patch13 -p1 -b .gcc296
-%patch14 -p1
-
+%patch14 -p1 -b .bug19212
+%patch15 -p1
+%patch16 -p1 -b .time
 %if %{enable_japanese}
 %patch20 -p0
 %endif
@@ -159,13 +193,42 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Wed Nov 21 2000 Crutcher Dunnavant <crutcher@redhat.com>
-- Add a modified version of Dr. Fink's mkstemp and LD_RUN_PATH
-- patch, closing some theoretical security holes
+* Tue Feb 27 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- added xtt-fonts requirement (for VFlib)
 
-* Fri Sep  1 2000 Mitsuo Hamada <mhamada@redhat.com>
-- add support JIS B size
-- fix the problem of reconverting GNUPLOT output 
+* Fri Feb  9 2001 Adrian Havill <havill@redhat.com>
+- cmpskit removed as a build prereq
+
+* Thu Feb  8 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- merged in some patches that got away:
+-	* Fri Sep  1 2000 Mitsuo Hamada <mhamada@redhat.com>
+	- add support JIS B size
+	- fix the problem of reconverting GNUPLOT output
+
+* Thu Feb  8 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- switched to japanese for everybody
+
+* Thu Feb  8 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- tweaked time_.h to test for linux, and include the right
+- header
+
+* Wed Feb  7 2001 Crutcher Dunnavnat <crutcher@redhat.com>
+- added the lxm3200 driver
+
+* Mon Dec 11 2000 Crutcher Dunnavant <crutcher@redhat.com>
+- merged in the (accendental) branch that contained the mktemp
+- and LD_RUN_PATH bug fixes.
+
+* Tue Oct 17 2000 Jeff Johnson <jbj@redhat.com>
+- tetex using xdvi with ghostscript patch (#19212).
+
+* Tue Sep 12 2000 Michael Stefaniuc <mstefani@redhat.com>
+- expanded the gcc296 patch to fix a compilation issue with the new stp
+  driver
+
+* Mon Sep 11 2000 Michael Stefaniuc <mstefani@redhat.com>
+- added the stp driver from the gimp-print project.
+  It supports high quality printing especialy with Epson Stylus Photo.
 
 * Wed Aug  2 2000 Matt Wilson <msw@redhat.com>
 - rebuilt against new libpng
diff --git a/sources b/sources
index a6934c0..5a15d54 100644
--- a/sources
+++ b/sources
@@ -7,3 +7,5 @@ e934d1bd3a48a1c151e2a15af0640c97  gs5.50-vflib-1.0.tar.gz
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
 e46bcac0aed0c511c8cc88a1093cc586  hp8xxs13.zip
 dcc402281f36afd2041144e0e97917be  hpdj-2.6.tar.gz
+ec11b9ef72ecaabb61eeba27e93f9f2b  lxm3200-0.4.1-gs5.50-src.tar.gz
+05af32e5c29d3a5657d2974352bc4286  print-4.0a3.tar.gz