diff --git a/ghostscript.spec b/ghostscript.spec
index fa055d6..d076823 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: 19
+Release: 25
 
 License: GPL
 URL: http://www.ghostscript.com/doc/gnu/
@@ -78,13 +78,17 @@ Patch42: ghostscript-7.05-cups.patch
 Patch43: ghostscript-7.07-badc.patch
 Patch44: ghostscript-7.07-fontconfig-rh.patch
 Patch45: gdevcups-crash.patch
+Patch46: ghostscript-7.07-gcc34.patch
+Patch47: ghostscript-7.07-gtk2.patch
+Patch48: ghostscript-7.07-omni-glib2.patch
+Patch49: ghostscript-bjc250gs.patch
 
-Requires: VFlib2, zlib, libpng, glib
+Requires: VFlib2, zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
-BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk+-devel
-BuildRequires: VFlib2-devel, glib-devel, XFree86-devel
+BuildRequires: zlib, zlib-devel, libpng, libpng-devel, unzip, gtk2-devel
+BuildRequires: VFlib2-devel, glib2-devel, XFree86-devel
 # Omni requires libxml
-BuildRequires: libxml-devel
+BuildRequires: libxml2-devel
 BuildRequires: cups-devel >= 1.1.13
 BuildPreReq: freetype-devel
 BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
@@ -472,6 +476,14 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
 %endif
 
 %patch45 -p1 -b .gdevcups-crash
+%patch46 -p1 -b .gcc34
+%patch47 -p1 -b .gtk2
+%patch48 -p1 -b .omni-glib2
+
+# Add bjc250gs driver
+%patch49 -p1 -b .bjc250gs
+	GS_DEVS=$GS_DEVS'$(DD)bjcmono.dev $(DD)bjcgray.dev '
+	GS_DEVS=$GS_DEVS'$(DD)bjccmyk.dev $(DD)bjccolor.dev '
 
 # Set up for a unix os, gcc compiler build, and replace our insertion string
 sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile
@@ -499,6 +511,7 @@ make
 cd ..
 
 make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -580,6 +593,27 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.a
 
 %changelog
+* Tue Mar  9 2004 Tim Waugh <twaugh@redhat.com> 7.07-25
+- Added bjc250gs driver (bug #117860).
+
+* Thu Mar  4 2004 Tim Waugh <twaugh@redhat.com> 7.07-24
+- Fix compilation with GCC 3.4.
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Feb 18 2004 Tim Waugh <twaugh@redhat.com> 7.07-23
+- Build against gtk2/glib2 (bug #115619).  Patch from W. Michael Petullo.
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> 7.07-22
+- rebuilt
+
+* Thu Feb 12 2004 Tim Waugh <twaugh@redhat.com> 7.07-21
+- Leave gdevpdfm.c seemingly-mistaken bitwise ops alone (bug #115396).
+
+* Thu Feb  5 2004 Tim Waugh <twaugh@redhat.com> 7.07-20
+- Fix compilation with GCC 3.4.
+
 * Wed Jan 28 2004 Tim Waugh <twaugh@redhat.com> 7.07-19
 - Attempt to fix gdevcups crash (bug #114256).
 - Make gs dynamically link to libgs (bug #114276).