diff --git a/libgphoto2_port/disk/disk.c b/libgphoto2_port/disk/disk.c
index 52ae5e466..9d722fdcf 100644
--- a/libgphoto2_port/disk/disk.c
+++ b/libgphoto2_port/disk/disk.c
@@ -130,7 +130,10 @@ gp_port_library_list (GPPortInfoList *list)
 			    (NULL != strstr(mntent->mnt_type,"sysfs"))||
 			    (NULL != strstr(mntent->mnt_type,"fuse"))||
 			    (NULL != strstr(mntent->mnt_type,"cifs"))||
-			    (NULL != strstr(mntent->mnt_type,"afs"))
+			    (NULL != strstr(mntent->mnt_type,"afs")) ||
+			/* mount options */
+				/* x-systemd.automount or similar */
+			    (NULL != strstr(mntent->mnt_opts,"automount"))
 )
 			) {
 				continue;
@@ -191,7 +194,9 @@ gp_port_library_list (GPPortInfoList *list)
 			    (NULL != strstr(mntent->mnt_type,"sysfs"))||
 			    (NULL != strstr(mntent->mnt_type,"fuse"))||
 			    (NULL != strstr(mntent->mnt_type,"cifs"))||
-			    (NULL != strstr(mntent->mnt_type,"afs"))
+			    (NULL != strstr(mntent->mnt_type,"afs")) ||
+			/* options */
+			    (NULL != strstr(mntent->mnt_opts,"automount"))
 			) {
 				continue;
 			}