diff --git a/kdegraphics.spec b/kdegraphics.spec
index 537a6f1..bcfa262 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -10,7 +10,7 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.3.1
-Release: 2
+Release: 3
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -19,7 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-buildroot
 License: GPL
 
 Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Source1: tiff-header.tar.bz2
 
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
@@ -254,21 +253,22 @@ Group: Applications/Multimedia
 This package contains a model editor for the PovRay raytracer.
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
+
+%if %{rhel}
+echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
+echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
+%else
 %patch2 -p1 -b libtiff
+%endif
 
 # disable kpovmodeler temporary. waiting for freeglut
 %if !%{kpovmodeler}
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
 
-%if %{rhel}
-   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
-   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in
-%endif
-
 make -f admin/Makefile.common cvs
 
 %build
@@ -343,6 +343,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Mon Nov 01 2004 Than Ngo <than@redhat.com> 7:3.3.1-3
+- rebuilt
+
+* Thu Oct 28 2004 Than Ngo <than@redhat.com> 7:3.3.1-2.1
+- add patch from 3_3_BRANCH
+
 * Fri Oct 15 2004 Than Ngo <than@redhat.com> 7:3.3.1-2
 - fix kfax to use system libtiff