diff --git a/.cvsignore b/.cvsignore
index 5e4f19e..855b408 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,6 @@
 acro5-cmaps-2001.tar.gz
 adobe-cmaps-200202.tar.gz
-eplaseren-1.0.2-550.tgz
+eplaser-3.1.4-705.tgz
 epson740.tgz
 gdevmd2k-0.2a.tar.gz
 ghostscript-7.07.tar.bz2
diff --git a/ghostscript.spec b/ghostscript.spec
index cefc6ad..855fe81 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -8,7 +8,7 @@ BuildRequires: patchutils >= 0.2.13
 # Set this to '1' for fontconfig support.
 %define use_fontconfig 1
 
-Release: 29
+Release: 30
 
 License: GPL
 URL: http://www.ghostscript.com/doc/gnu/
@@ -40,7 +40,8 @@ Source13: ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200202.tar.gz
 Source15: ftp://ftp.u-aizu.ac.jp/pub/tex/ptex-win32/gs/%{vflib_ver}-j-vlib.zip
 Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz
 Source17: gdevgdi.c
-Source18: http://www.epkowa.on.arena.ne.jp/pips/data/2050/eplaseren-1.0.2-550.tgz
+# http://www.epkowa.co.jp/english/linux_e/dl_laser.html
+Source18: eplaser-3.1.4-705.tgz
 Source20: CIDFnmap
 
 # CUPS device (from ESP gs 7.05.4).
@@ -57,7 +58,6 @@ Patch12: ghostscript-7.05-vflib.fixup.patch
 Patch13: ghostscript-6.51-res_path.patch
 Patch14: ghostscript-7.05-ps2epsi.patch
 Patch16: ghostscript-6.51-gdevgdi.patch
-Patch17: ghostscript-6.51-Epson_eplaseren.patch
 Patch18: ghostscript-6.51-gs_path.patch
 Patch19: ghostscript-6.51-ia64_jmp_buf.patch
 Patch21: Omni-7.05-121002.patch
@@ -395,11 +395,11 @@ $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
 
 # Add Epson's old eplaseren drivers
 	tar xzf %{SOURCE18} -C src
-%patch17 -p1 -b .Epson_eplaseren
 
 	GS_DEVS=$GS_DEVS'$(DD)epl5800.dev $(DD)epl2050.dev $(DD)epl2050p.dev '
-	GS_DEVS=$GS_DEVS'$(DD)alc8500.dev $(DD)alc2000.dev '
-	cat src/eplaser/*.mak >> src/contrib.mak
+	GS_DEVS=$GS_DEVS'$(DD)alc8500.dev $(DD)alc2000.dev $(DD)alc1900.dev '
+	GS_DEVS=$GS_DEVS'$(DD)alc4000.dev $(DD)alc4100.dev $(DD)alc8600.dev '
+	cat src/eplaser-*/*.mak >> src/contrib.mak
 
 	# Repair the gsj code
 %patch6 -p1 -b ._ds
@@ -597,6 +597,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.a
 
 %changelog
+* Tue Jul 20 2004 Tim Waugh <twaugh@redhat.com> 7.07-30
+- Updated eplaser driver to add alc4000 (bug #128007).
+
 * Fri Jun 25 2004 Tim Waugh <twaugh@redhat.com> 7.07-29
 - Prevent pdf2ps generating "null setpagesize" (bug #126446).
 
diff --git a/sources b/sources
index 8014ac8..72b32ef 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 e8fbffadb8d70ce5f92708a699ae7765  adobe-cmaps-200202.tar.gz
-911c7865a83a69135417989dee53f8fc  eplaseren-1.0.2-550.tgz
+94246b034af171b4336d90198e9f4bd8  eplaser-3.1.4-705.tgz
 2c6ebfe51cab34ee61e3dd524c8640cc  epson740.tgz
 5ed2b4218b8f77cb411f3d2e4509ed24  gdevmd2k-0.2a.tar.gz
 85fd16cdc8232e5e3679a3a7e30a3359  ghostscript-7.07.tar.bz2