diff --git a/dndfile.diff b/dndfile.diff
deleted file mode 100644
index 38e4e05..0000000
--- a/dndfile.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbtcore/diskio/multifilecache.cpp
-+++ libbtcore/diskio/multifilecache.cpp
-@@ -343,7 +343,7 @@ namespace bt
- 		// then make the file
- 		if (dnd)
- 		{
--			bt::Touch(tmpdir + "dnd" + bt::DirSeparator() + fpath);
-+			bt::Touch(tmpdir + "dnd" + bt::DirSeparator() + fpath + ".dnd");
- 		}
- 		else
- 		{
diff --git a/function-address.diff b/function-address.diff
new file mode 100644
index 0000000..42a1411
--- /dev/null
+++ b/function-address.diff
@@ -0,0 +1,11 @@
+--- plugins/webinterface/httpserver.cpp
++++ plugins/webinterface/httpserver.cpp
+@@ -468,7 +468,7 @@ namespace kt
+ 		
+ 		QDataStream out(&tmp_file);
+ 		out.writeRawData(ptr + (pos + 4),len - (pos + 4));
+-		out << flush;
++		tmp_file.flush();
+ 		tmp_file.close();
+ 		
+ 		Out(SYS_WEB|LOG_NOTICE) << "Loading file " << save_file << endl;
diff --git a/ktorrent.changes b/ktorrent.changes
index 5f8dcd5..0068626 100644
--- a/ktorrent.changes
+++ b/ktorrent.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 18 23:04:47 CEST 2008 - schwab@suse.de
+
+- Fix use of function address.
+- Fix proxy setting.
+
 -------------------------------------------------------------------
 Sun Aug 17 17:55:14 CEST 2008 - stbinner@suse.de
 
diff --git a/ktorrent.spec b/ktorrent.spec
index 1090924..3907570 100644
--- a/ktorrent.spec
+++ b/ktorrent.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 
 Name:           ktorrent
@@ -28,14 +27,15 @@ License:        GPL v2 or later
 Group:          Productivity/Networking/File-Sharing
 Summary:        KDE BitTorrent Client
 Version:        3.1.2
-Release:        1
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define rversion %version
 Source:         %{name}-%{rversion}.tar.bz2
 Source2:        icons.tar.bz2
 Patch2:         remove-links.diff
 Patch4:         no-geoip-db.diff
-Patch6:         dndfile.diff
+Patch5:         function-address.diff
+Patch6:         proxy.diff
 %if %suse_version > 1020
 Requires:       %{name}-lang = %{version}
 %endif
@@ -79,7 +79,8 @@ Authors:
 %setup -q -n %{name}-%{version}
 %patch2
 %patch4
-#%patch6
+%patch5
+%patch6
 tar xfj %{SOURCE2}
 
 %build
@@ -95,8 +96,7 @@ tar xfj %{SOURCE2}
   %kde_post_install
   %find_lang %name
 
-%pre
-%run_ldconfig
+%pre -p /sbin/ldconfig
 
 %post -p /sbin/ldconfig
 
@@ -129,12 +129,14 @@ tar xfj %{SOURCE2}
 /usr/share/applications/kde4/ktorrent.desktop
 /usr/share/icons/hicolor/*/apps/ktorrent.*
 /usr/share/icons/hicolor/*/mimetypes/torrent.*
-/usr/share/icons/hicolor/*/actions/
+/usr/share/icons/hicolor/*/actions/kt-bandwidth-scheduler.*
 /usr/share/icons/hicolor/*/actions/kt-change-tracker.*
 /usr/share/icons/hicolor/*/actions/kt-check-data.*
 /usr/share/icons/hicolor/*/actions/kt-chunks.*
+/usr/share/icons/hicolor/*/actions/kt-encrypted.*
 /usr/share/icons/hicolor/*/actions/kt-info-widget.*
 /usr/share/icons/hicolor/*/actions/kt-pause.*
+/usr/share/icons/hicolor/*/actions/kt-plugins.*
 /usr/share/icons/hicolor/*/actions/kt-queue-manager.*
 /usr/share/icons/hicolor/*/actions/kt-remove.*
 /usr/share/icons/hicolor/*/actions/kt-restore-defaults.*
@@ -170,6 +172,9 @@ tar xfj %{SOURCE2}
 /usr/include/libbtcore
 
 %changelog
+* Tue Aug 19 2008 schwab@suse.de
+- Fix use of function address.
+- Fix proxy setting.
 * Sun Aug 17 2008 stbinner@suse.de
 - update to version 3.1.2: the most notable fixes are a problem
   which can cause a lot of memory usage, several crashes, and a
diff --git a/proxy.diff b/proxy.diff
new file mode 100644
index 0000000..f0e347f
--- /dev/null
+++ b/proxy.diff
@@ -0,0 +1,19 @@
+--- libbtcore/tracker/httptracker.cpp
++++ libbtcore/tracker/httptracker.cpp
+@@ -456,6 +456,7 @@ namespace bt
+ 		md["cookies"] = "none";
+ 	//	md["accept"] = "text/plain";
+ 		md["accept"] = "text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2";
++		md["UseProxy"] = QString();
+ 		if (proxy_on)
+ 		{
+ 			QString p = QString("%1:%2").arg(proxy).arg(proxy_port);
+@@ -463,8 +464,6 @@ namespace bt
+ 			KUrl url = KUrl(p);
+ 			if (url.isValid() && proxy.trimmed().length() >  0)
+ 				md["UseProxy"] = p;
+-			else
+-				md["UseProxy"] = QString();
+ 			
+ 			Out(SYS_TRK|LOG_DEBUG) << "Using proxy : " << md["UseProxy"] << endl;
+ 		}