diff --git a/.cvsignore b/.cvsignore
index 84a77f1..cd81bb6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ kdegraphics-3.4.2.tar.bz2
 kdegraphics-3.4.91.tar.bz2
 kdegraphics-3.4.92.tar.bz2
 kdegraphics-3.5.0.tar.bz2
+kdegraphics-3.5.1.tar.bz2
diff --git a/kdegraphics.spec b/kdegraphics.spec
index d27474b..ce0ee07 100644
--- a/kdegraphics.spec
+++ b/kdegraphics.spec
@@ -3,6 +3,9 @@
 %define debug 0
 %define final 0
 
+%define kdelibs_epoch 6
+%define kdebase_epoch 6
+
 %define kpovmodeler 0
 %define kfract 0
 %define arts 1
@@ -12,8 +15,8 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.0
-Release: 3
+Version: 3.5.1
+Release: 1
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -26,10 +29,9 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b
 Patch0: kde-libtool.patch
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
-Patch3: kdegraphics-3.5.0-xft.patch
 
-# security fixes
-Patch100: post-3.5.0-kdegraphics-CAN-2005-3193.diff
+# upstream patches
+Patch50; kdegraphics-3.5.1-kpdf.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -49,10 +51,9 @@ BuildRequires: imlib-devel
 BuildRequires: fribidi-devel 
 BuildRequires: libieee1284-devel
 
-Requires: kdelibs >= 6:%{version}
-Requires: kdebase >= 6:%{version}
-
-Prereq: /sbin/ldconfig
+Requires: kdelibs >= %{kdelibs_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post,postun): /sbin/ldconfig
 
 %description
 Graphics applications for the K Desktop Environment.
@@ -265,10 +266,9 @@ This package contains a model editor for the PovRay raytracer.
 %patch0 -p1 -b .libtool
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
-%patch3 -p1 -b .modular-x
 
-# security fixes
-%patch100 -p0 -b .CAN-2005-3193
+# uüstream patches
+%patch50 -p1 -b .kpdf
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -280,13 +280,6 @@ This package contains a model editor for the PovRay raytracer.
    echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in
 %endif
 
-%if %{disable_gcc_check_and_hidden_visibility}
-  # disable gcc check
-  perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in
-  # disable hidden visibility
-  perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in
-%endif
-
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -299,18 +292,27 @@ export KDEDIR=%{_prefix}
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 
 %configure \
+   --enable-new-ldflags \
+   --disable-dependency-tracking \
    --with-qt-libraries=$QTDIR/lib \
    --disable-rpath \
+%if %{disable_gcc_check_and_hidden_visibility}
+   --disable-gcc-hidden-visibility \
+%endif
 %if %{arts} == 0
    --without-arts \
 %endif
+%if %{debug} == 0
+   --disable-debug \
+   --disable-warnings \
+%endif%
 %if %{final}
    --enable-final \
 %endif
    --includedir=/usr/include/kde \
    --with-xinerama \
 %ifnarch %{no_scanner_archs}
---with-kamera \
+   --with-kamera \
 %else
    --without-kamera
 %endif
@@ -365,6 +367,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/*
 
 %changelog
+* Sat Feb 04 2006 Than Ngo <than@redhat.com> 7:3.5.1-1 
+- 3.5.1
+
 * Mon Jan 16 2006 Than Ngo <than@redhat.com> 7:3.5.0-3
 - apply patch to fix CAN-2005-3193, #177908
 
diff --git a/sources b/sources
index 4ed5be2..cf5a35d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-389a00d4387e621d4dd325a59c7657c4  kdegraphics-3.5.0.tar.bz2
+2cd1c5348b7df46cf7f9d91e1dbfebd2  kdegraphics-3.5.1.tar.bz2