diff -u -r kdebase-3.5.4/kioslave/old_media/mediamanager/halbackend.cpp kdebase-3.5.4/kioslave/media/mediamanager/halbackend.cpp
--- kdebase-3.5.4/kioslave/old_media/mediamanager/halbackend.cpp	2006-07-22 05:15:45.000000000 -0300
+++ kdebase-3.5.4/kioslave/media/mediamanager/halbackend.cpp	2006-09-13 15:12:17.000000000 -0300
@@ -856,7 +856,7 @@
     mount_point = config.readEntry("mountpoint", mount_point);
 
     if (!mount_point.startsWith("/"))
-        mount_point = "/media/" + mount_point;
+        mount_point = "/mnt/" + mount_point;
 
     result << QString("mountpoint=%1").arg(mount_point);
     result << QString("filesystem=%1").arg(fstype);
@@ -1044,6 +1044,8 @@
     QString mount_point = valids["mountpoint"];
     if (mount_point.startsWith("/media/"))
         mount_point = mount_point.mid(7);
+    else if ( mount_point.startsWith( "/mnt/" ) )
+       mount_point = mount_point.mid(5);
 
     if (valids.contains("shortname"))
     {
diff -u -r kdebase-3.5.4/kioslave/old_media/mediamanager/mediamanager.cpp kdebase-3.5.4/kioslave/media/mediamanager/mediamanager.cpp
--- kdebase-3.5.4/kioslave/old_media/mediamanager/mediamanager.cpp	2006-07-22 05:15:45.000000000 -0300
+++ kdebase-3.5.4/kioslave/media/mediamanager/mediamanager.cpp	2006-09-13 15:13:42.000000000 -0300
@@ -145,6 +145,8 @@
                 QString path = u.path();
                 if (path.startsWith("/media/"))
                     path = path.mid(strlen("/media/"));
+                else if ( path.startsWith( "/mnt/" ) )
+                   path = path.mid( strlen( "/mnt/" ) );
                 m = m_mediaList.findByName(path);
                 kdDebug() << "findByName " << path << m << endl;
             }
diff -u -r kdebase-3.5.4/kioslave/old_media/propsdlgplugin/propertiespage.cpp kdebase-3.5.4/kioslave/media/propsdlgplugin/propertiespage.cpp
--- kdebase-3.5.4/kioslave/old_media/propsdlgplugin/propertiespage.cpp	2006-07-22 05:15:43.000000000 -0300
+++ kdebase-3.5.4/kioslave/media/propsdlgplugin/propertiespage.cpp	2006-09-13 15:15:36.000000000 -0300
@@ -191,9 +191,9 @@
     result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]);
 
   QString mp = option_mountpoint->text();
-  if (!mp.startsWith("/media/"))
+  if (!mp.startsWith("/media/") && !mp.startsWith( "/mnt/" ) )
     {
-      KMessageBox::sorry(this, i18n("Mountpoint has to be below /media"));
+      KMessageBox::sorry(this, i18n("Mountpoint has to be below /mnt"));
       return false;
     }
   result << QString("mountpoint=%1").arg(mp);