diff --git a/.cvsignore b/.cvsignore
index a3dceb0..3323db1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
+gimp-1.2.3-newperl.patch.bz2
+gimp-1.2.3-wget-fix.patch.bz2
 gimp-1.2.3.tar.bz2
diff --git a/gimp.spec b/gimp.spec
index 3c432d3..88c183b 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -5,7 +5,7 @@
 Summary: The GNU Image Manipulation Program.
 Name: 		gimp
 Version: 	%{subver}.%{microver}
-Release: 4
+Release: 6
 Epoch:		1
 Copyright: 	GPL, LGPL
 Group: Applications/Multimedia
@@ -20,6 +20,8 @@ Source1:	gimp.desktop
 Source2:	gimp.png
 Patch0:         gimp-1.1.23-perlpath.patch
 Patch1:         gimp-1.2.1-libaa.patch
+Patch2:		gimp-1.2.3-newperl.patch.bz2
+Patch3:		gimp-1.2.3-wget-fix.patch.bz2
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -67,6 +69,8 @@ GIMP image manipulation program.
 %setup -q
 %patch0 -p1 -b .perlpath
 %patch1 -p1 -b .libaa
+%patch2 -p1
+%patch3 -p1
 
 %build
 #AUTOMAKE=automake-1.4 autoreconf
@@ -78,17 +82,28 @@ fi
 
 if [ "$SMP" != "" ]; then
   (make "MAKE=make -k -j $SMP"; exit 0)
-  make
+  make 
 else
   make
 fi
 
 %install
+sed "s,\(=/\)\([a-z]\),=$RPM_BUILD_ROOT/\2,g" gimptool-1.2 > tmptool
+chmod 755 tmptool
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rootdir=`pwd`
+pushd plug-ins/perl
+perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null
+for I in `find -name Makefile`; do
+    sed "s,/usr/bin/gimptool,$rootdir/tmptool,g" $I > $I-
+    mv $I- $I
+done
+popd
 mkdir -p $RPM_BUILD_ROOT/%{_infodir} $RPM_BUILD_ROOT/%{_includedir} \
 	$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir} \
         $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver}/plug-ins
 
+
 # makeinstall macro won't work here - libexec is overriden
 make prefix=$RPM_BUILD_ROOT/%{_prefix} \
      bindir=$RPM_BUILD_ROOT/%{_bindir} \
@@ -100,9 +115,7 @@ make prefix=$RPM_BUILD_ROOT/%{_prefix} \
      gimpsysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir}/gimp/%{subver} \
      gimpplugindir=$RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} \
      gimpdatadir=$RPM_BUILD_ROOT/%{_datadir}/gimp/%{subver} \
-     PREFIX=$RPM_BUILD_ROOT/%{_prefix} \
-     INSTALLMAN3DIR=$RPM_BUILD_ROOT/usr/lib/perl5/man \
-     INSTALLMAN1DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
+     GIMPTOOL=`pwd`/tmptool \
      install
 
 # remove the perl temp file to satisfy rpmlint
@@ -261,6 +274,14 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps
 %{_bindir}/xcftopnm
 
 %changelog
+* Mon Aug 19 2002 Matt Wilson <msw@redhat.com>
+- fix up gimp-perl madness to work with 5.8.0
+- added gimp-1.2.3-wget-fix.patch.bz2 from Mandrake's gimp package
+- added gimp-1.2.3-newperl.patch.bz2 from Mandrake's gimp package
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
 * Mon Apr 15 2002 Matt Wilson <msw@redhat.com>
 - filter .la files from main gimp package (#43317, #57571, #56667,
   #51591, #63371)
diff --git a/sources b/sources
index 88ec8a8..9b24488 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
+65c90518b954a24d46cdd931d8be550f  gimp-1.2.3-newperl.patch.bz2
+b528311805c993094b196ed3eb7c0cd1  gimp-1.2.3-wget-fix.patch.bz2
 b19235f19f524f772a4aef597a69b1da  gimp-1.2.3.tar.bz2