diff --git a/gimp.spec b/gimp.spec
index 2a4ae15..6d91d1b 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -29,7 +29,7 @@ Version:        2.6.4
 %define age 0
 %define minorver 600
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
@@ -62,7 +62,11 @@ BuildRequires:  librsvg2-devel >= 2.14.0
 BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pango-devel >= 1.18.0
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires:  poppler-glib-devel >= 0.4.1
+%else
 BuildRequires:  poppler-devel >= 0.4.1
+%endif
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
@@ -125,9 +129,10 @@ Manipulation Program (GIMP).
 
 %package devel
 Summary:        GIMP plugin and extension development kit
-Group:          Applications/Multimedia
+Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
@@ -137,6 +142,16 @@ The gimp-devel package contains the static libraries and header files
 for writing GNU Image Manipulation Program (GIMP) plug-ins and
 extensions.
 
+%package devel-tools
+Summary:        GIMP plugin and extension development tools
+Group:          Development/Tools
+License:        LGPLv2+
+Requires:       gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel-tools
+The gimp-devel-tools package contains gimptool, a helper program to build GNU
+Image Manipulation Program (GIMP) plug-ins and extensions.
+
 %package help-browser
 Summary:        GIMP help browser plug-in
 Group:          Applications/Multimedia
@@ -421,14 +436,6 @@ fi
 %doc HACKING README.i18n
 %doc %{_datadir}/gtk-doc/*
 
-%{_bindir}/gimptool-%{interfacever}
-%{_mandir}/man1/gimptool-%{interfacever}.1*
-
-%if %{with convenience}
-%{_bindir}/gimptool
-%{_mandir}/man1/gimptool.1*
-%endif
-
 %{_libdir}/*.so
 %dir %{_libdir}/gimp
 %dir %{_libdir}/gimp/%{interfacever}
@@ -441,11 +448,27 @@ fi
 %{_includedir}/gimp-%{interfacever}
 %{_libdir}/pkgconfig/*
 
+%files devel-tools
+%defattr (-, root, root, 0755)
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
 %files help-browser
 %defattr (-, root, root, 0755)
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Wed Jan 07 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.4-3
+- split off gimptool into new gimp-devel-tools subpackage to avoid multilib
+  conflicts (#477789)
+- require poppler-glib-devel for building from F9 on (#478691)
+- fix gimp-devel package group
+
 * Sun Jan 04 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.4-2
 - enable building with aalib