diff --git a/ghostscript.spec b/ghostscript.spec
index f7f6aad..c2e037e 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and renderer
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -40,6 +40,8 @@ BuildRequires: libtool
 BuildRequires: jasper-devel
 BuildRequires: dbus-devel
 BuildRequires: poppler-data
+BuildRequires: lcms2-devel
+BuildRequires: openjpeg-devel
 %{?_with_freetype:BuildRequires: freetype-devel}
 BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root
 
@@ -100,7 +102,7 @@ CUPS filter and conversion rules for interpreting PostScript and PDF.
 
 %prep
 %setup -q -n %{name}-%{gs_ver}
-rm -rf libpng zlib jpeg jasper expat
+rm -rf expat freetype icclib jasper jpeg lcms2 libpng openjpeg zlib
 
 # Fix ijs-config not to have multilib conflicts (bug #192672)
 %patch1 -p1 -b .multilib
@@ -320,6 +322,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Tue Sep 11 2012 Tim Waugh <twaugh@redhat.com> 9.05-2
+- Removed more bundled packages (bug #816747). In particular, icclib
+  is no longer bundled (bug #856060, CVE-2012-4405).
+
 * Thu Feb  9 2012 Tim Waugh <twaugh@redhat.com>
 - Avoid mixed tabs and spaces in spec file.