diff --git a/lvm.conf b/lvm.conf
index da3629f..eebd4d6 100644
--- a/lvm.conf
+++ b/lvm.conf
@@ -71,8 +71,8 @@ devices {
     # is an 'r' pattern for any of the names it is rejected; otherwise it is
     # accepted.
 
-    # By default we accept every block device except udev names:
-    filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|", "a/.*/" ]
+    # By default we accept every block device except udev names, floppy and cdrom drives:
+    filter = [ "r|/dev/.*/by-path/.*|", "r|/dev/.*/by-id/.*|","r|/dev/fd.*|", "r|/dev/cdrom|",  "a/.*/" ]
 
     # Exclude the cdrom drive
     # filter = [ "r|/dev/cdrom|" ]
diff --git a/lvm2.changes b/lvm2.changes
index 9fe42fa..5a38a31 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  8 08:47:51 UTC 2014 - lwang@suse.com
+
+- bnc#862403, modify lvm.conf to add filter to exclude floppy and cdrom 
+
 -------------------------------------------------------------------
 Tue Mar 25 09:08:16 UTC 2014 - dmzhang@suse.com