diff --git a/findutils.changes b/findutils.changes
index cdaec1f..3e22ec7 100644
--- a/findutils.changes
+++ b/findutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 23 12:24:12 CEST 2013 - pth@suse.de
+
+- Add /var/run/media to UPDATEDB_PRUNEPATHS in sysconfig.locate
+  so that updatedb doesn't index removable media (bnc#807170).
+
 -------------------------------------------------------------------
 Tue Mar 26 13:29:42 UTC 2013 - mmeister@suse.com
 
diff --git a/sysconfig.locate b/sysconfig.locate
index e6fafca..ff74dd5 100644
--- a/sysconfig.locate
+++ b/sysconfig.locate
@@ -1,5 +1,8 @@
 ## Path:	Applications/Locate
 ## Description:	Configuration of updatedb
+#
+# NOTE: These variables only apply when updatedb is run via cron
+#
 ## Type:	yesno
 ## Default:	yes
 #
@@ -35,7 +38,7 @@ UPDATEDB_NETPATHS=""
 # uptdatedb can skip directories for its database. The following parameter
 # says which ones.
 #
-UPDATEDB_PRUNEPATHS="/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshot"
+UPDATEDB_PRUNEPATHS="/mnt /cdrom /tmp /usr/tmp /var/tmp /var/spool /proc /media /sys /.snapshot /var/run/media"
 
 ## Type:	string("",nobody)
 ## Default:	""