diff --git a/kdelibs.spec b/kdelibs.spec
index 19e9e79..15397a8 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -75,6 +75,8 @@ Patch12: kdelibs-4.x-xdg-menu.patch
 Patch13: kdelibs-4.0.3-fedora-buildtype.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.0.3-libexecdir.patch
+# fix proxy support (#443931, kde#155707)
+Patch15: kdelibs-4.0.4-proxy.patch
 
 ## upstream patches
 
@@ -193,6 +195,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch12 -p1 -b .Administration-menu
 %patch13 -p1 -b .fedora-buildtype
 %patch14 -p1 -b .libexecdir
+%patch15 -p0 -b .proxy
 
 
 %build
@@ -292,8 +295,6 @@ rm -rf %{buildroot}
 %exclude %{_kde4_appsdir}/kdewidgets/
 %exclude %{_kde4_libdir}/kde4/plugins/designer/kdewidgets.*
 %exclude %{_kde4_appsdir}/cmake/
-# ksgmltools2
-%exclude %{_kde4_appsdir}/ksgmltools2/
 %{_kde4_configdir}/*
 %{_datadir}/dbus-1/interfaces/*
 %{_kde4_datadir}/mime/packages/*
@@ -339,7 +340,6 @@ rm -rf %{buildroot}
 %{_kde4_bindir}/kde4-doxygen.sh
 %{_kde4_appsdir}/cmake/
 %{_kde4_appsdir}/kdewidgets/
-%{_kde4_appsdir}/ksgmltools2/
 %{_kde4_includedir}/*
 %{_kde4_libdir}/kde4/devel/
 %{_kde4_libdir}/kde4/plugins/designer/
@@ -353,6 +353,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu May 15 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.4-3
+- fix proxy support (#443931, kde#155707)
+- move %%{_kde4_appsdir}/ksgmltools2/ from -devel to the main package (#446435)
+
 * Tue May 13 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.4-2
 - drop no longer needed ALSA default device Phonon hack