diff --git a/gimp.spec b/gimp.spec
index 5509262..1c652d9 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -34,8 +34,12 @@
 # hardening:   use various compiler/linker flags to harden binaries against
 #              certain types of exploits
 %bcond_without hardening
-# Reset this once poppler picks up the updated xpdf version of "GPLv2 or GPLv3"
+# poppler:     use from version 0.20 on which is GPLv2/GPLv3 dual-licensed
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+%bcond_without poppler
+%else
 %bcond_with poppler
+%endif
 
 
 # Set this to 0 in stable, 1 in (SONAME-wise) unstable releases
@@ -67,7 +71,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.8.0
-Release:        %{?prerelprefix}1%{dotprerel}%{dotgitrev}%{?dist}
+Release:        %{?prerelprefix}2%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros
 # Ugly hack, you need to get your quoting backslashes/percent signs straight
@@ -86,7 +90,13 @@ Release:        %{?prerelprefix}1%{dotprerel}%{dotgitrev}%{?dist}
 %global lib_micro 0
 %endif # unstable
 
+%if %{with poppler}
+# poppler is "GPLv2 or GPLv3" which makes plug-ins linking to libpoppler such
+# as file-pdf-load GPLv3-only
+License:        GPLv3+ and GPLv3
+%else
 License:        GPLv3+
+%endif
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
@@ -132,11 +142,7 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libwmf-devel >= 0.2.8
 BuildRequires:  pango-devel >= 1.29.4
 %if %{with poppler}
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
-BuildRequires:  poppler-glib-devel >= 0.12.4
-%else
-BuildRequires:  poppler-devel >= 0.12.4
-%endif
+BuildRequires:  poppler-glib-devel >= 0.20.0
 %endif
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
@@ -532,6 +538,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
 
 %changelog
+* Mon Jun 25 2012 Nils Philippsen <nils@redhat.com> - 2:2.8.0-2
+- build with poppler >= 0.20.0 from Fedora 18 on as it is GPLv2/GPLv3
+  dual-licensed
+
 * Thu May 10 2012 Nils Philippsen <nils@redhat.com> - 2:2.8.0-1
 - version 2.8.0