diff -u kdebase-3.5.6/debian/changelog kdebase-3.5.6/debian/changelog
--- kdebase-3.5.6/debian/changelog
+++ kdebase-3.5.6/debian/changelog
@@ -1,3 +1,12 @@
+kdebase (4:3.5.6-0ubuntu20) feisty; urgency=low
+
+  * Add kubuntu_95_safely-remove_umount_dialog.diff
+    On 'Safely Remove' this will make a kprogressdialog-popup telling 
+    the user it's unmounting. 
+    The popup will not close until the umount is complete. (Closes: LP #61946)
+
+ -- Frode M. Døving <frode@ubuntu.com>  Sun,  8 Apr 2007 01:10:14 +0200
+
 kdebase (4:3.5.6-0ubuntu19) feisty; urgency=low
 
   * Fixes konsole.README.Debian according to debian changes.
only in patch2:
unchanged:
--- kdebase-3.5.6.orig/debian/patches/kubuntu_95_safely-remove_umount_dialog.diff
+++ kdebase-3.5.6/debian/patches/kubuntu_95_safely-remove_umount_dialog.diff
@@ -0,0 +1,98 @@
+diff -Nur kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.cpp kdebase-3.5.6.new/kioslave/media/mounthelper/kio_media_mounthelper.cpp
+--- kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2007-04-08 18:02:52.000000000 +0200
++++ kdebase-3.5.6.new/kioslave/media/mounthelper/kio_media_mounthelper.cpp	2007-04-08 18:11:41.000000000 +0200
+@@ -2,6 +2,8 @@
+    Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
+    Parts of this file are
+    Copyright 2003 Waldo Bastian <bastian@kde.org>
++   Small changes for Kubuntu by
++   Copyright 2007 Frode M. Døving <frode@lnix.net>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -31,6 +33,7 @@
+ #include <kdebug.h>
+ #include <kglobal.h>
+ #include <kprocess.h>
++#include <kprogress.h>
+ #include <kstartupinfo.h>
+ 
+ #include "kio_media_mounthelper.h"
+@@ -75,6 +78,7 @@
+ MountHelper::MountHelper() : KApplication()
+ {
+ 	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
++    m_progress = new KProgressDialog();
+ 
+ 	m_errorStr = "";
+ 
+@@ -136,6 +140,15 @@
+ 		*/
+ 		if (medium.isMounted())
+ 		{
++            m_progress->setLabel(i18n("Unmounting, please wait")+"..");
++            m_progress->setAutoClose(true);
++            m_progress->setAllowCancel(false);
++            m_progress->progressBar()->setTextEnabled(false);
++            m_progress->progressBar()->setTotalSteps(10);
++            m_progress->show();
++            QTimer *t = new QTimer(this);
++            connect(t, SIGNAL(timeout()), SLOT(progressAdvance()));
++            t->start(250, FALSE);
+ 			DCOPRef mediamanager("kded", "mediamanager");
+ 			DCOPReply reply = mediamanager.call( "unmount", medium.id());
+ 			if (reply.isValid())
+@@ -157,6 +170,12 @@
+ 	}
+ }
+ 
++void MountHelper::progressAdvance()
++{
++    if (m_progress->progressBar()->progress() < 9)
++        m_progress->progressBar()->advance(1);
++}
++
+ void MountHelper::invokeEject(const QString &device, bool quiet)
+ {
+ 	KProcess *proc = new KProcess(this);
+@@ -177,7 +196,7 @@
+ 	* If eject failed, report the error stored in m_errorStr
+ 	*/
+ 	if (proc->normalExit() && proc->exitStatus() == 0) {
+-		::exit(0);
++        QTimer::singleShot(1000, this, SLOT(quit()));
+ 	} else {
+ 		if (m_errorStr.isEmpty()) {
+ 			if (m_isCdrom)
+diff -Nur kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.h kdebase-3.5.6.new/kioslave/media/mounthelper/kio_media_mounthelper.h
+--- kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.h	2007-04-08 13:25:31.000000000 +0200
++++ kdebase-3.5.6.new/kioslave/media/mounthelper/kio_media_mounthelper.h	2007-04-08 18:11:31.000000000 +0200
+@@ -2,6 +2,8 @@
+    Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
+    Parts of this file are
+    Copyright 2003 Waldo Bastian <bastian@kde.org>
++   Small changes for Kubuntu by
++   Copyright 2007 Frode M. Døving <frode@lnix.net>
+ 
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+@@ -23,6 +25,7 @@
+ #define _KIO_MEDIA_MOUNTHELPER_H_
+ 
+ #include <kapplication.h>
++#include <kprogress.h>
+ #include <qstring.h>
+ #include <kio/job.h>
+ #include <kurl.h>
+@@ -40,9 +43,11 @@
+ 	void invokeEject(const QString &device, bool quiet=false);
+ 	QString m_errorStr;
+ 	QString m_device;
++    KProgressDialog *m_progress;
+ 	bool m_isCdrom;
+ 
+ private slots:
++    void progressAdvance();
+ 	void ejectFinished(KProcess* proc);
+ 	void error();
+ };