diff --git a/gimp.spec b/gimp.spec
index 42114d6..5746566 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -51,13 +51,12 @@ Version:        2.4.7
 %define age 0
 %define minorver 400
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          2
 License:        GPLv2+
 Group:          Applications/Multimedia
 URL:            http://www.gimp.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
-Obsoletes:      gimp2 gimp-beta <= %{?epoch:%{epoch}:}2.4
 Obsoletes:      gimp-perl < 2:2.0
 BuildRequires:  alsa-lib-devel >= 1.0.0
 BuildRequires:  curl-devel >= 7.15.1
@@ -153,7 +152,6 @@ Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:       gtk2-devel
 Requires:       glib2-devel
 Requires:       pkgconfig
-Obsoletes:      gimp2-devel gimp-beta-devel <= %{?epoch:%{epoch}:}2.4
 
 %description devel
 The gimp-devel package contains the static libraries and header files
@@ -195,31 +193,31 @@ if [ ! -f configure ]; then
 fi
 CFLAGS="%optflags -fomit-frame-pointer" \
 %configure \
-	--disable-perl \
+    --disable-perl \
 %if %{with python}
-	--enable-python \
+    --enable-python \
 %else
-	--disable-python \
+    --disable-python \
 %endif
 %if %{with mp}
-	--enable-mp \
+    --enable-mp \
 %else
-	--disable-mp \
+    --disable-mp \
 %endif
 %if %{with static}
-	--enable-static \
+    --enable-static \
 %else
-	--disable-static \
+    --disable-static \
 %endif
 %if %{with print}
-	--with-print \
+    --with-print \
 %else
-	--without-print \
+    --without-print \
 %endif
 %if %{with lcms}
-	--with-lcms \
+    --with-lcms \
 %else
-	--without-lcms \
+    --without-lcms \
 %endif
     --enable-gimp-console \
     --without-aa \
@@ -300,6 +298,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
 mkdir -p %{buildroot}%{_sbindir}
 install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
 
+# make pyconsole.py executable, gimp/gnome bug #552601
+chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
+
 %clean
 rm -rf %{buildroot}
 
@@ -456,6 +457,14 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Sep 17 2008 Nils Philippsen <nils@redhat.com> - 2:2.4.7-2
+- Merge review:
+  - convert spec file to UTF-8
+  - remove unneeded gimp2, gimp-beta obsoletes
+  - quote macros in changelog
+  - use only spaces, not tabs
+  - make pyconsole.py plug-in executable (upstream bug #552601)
+
 * Fri Aug 22 2008 Nils Philippsen <nphilipp@redhat.com> - 2:2.4.7-1
 - version 2.4.7
 
@@ -1189,7 +1198,7 @@ fi
 * Mon Apr  2 2001 Preston Brown <pbrown@redhat.com>
 - some gimp-perl files weren't defattr'd (#34325)
 
-* Fri Mar 30 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+* Fri Mar 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - Don't include embedxpm, as it depends on a non-included perl module (#=33249)
 - move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp
   module
@@ -1279,6 +1288,4 @@ fi
 
 * Wed Dec 22 1999 Gregory McLean <gregm@comstar.net>
 - Version 1.1.14
-- Added some auto %files section generation scriptlets
-
-
+- Added some auto %%files section generation scriptlets