diff --git a/debian/changelog b/debian/changelog
index f6ebd66..eb2336d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ rpi-imager (1.6) unstable; urgency=medium
 
   * Wayland: fix "Client tried to set invalid geometry" error
   * Add advanced users option screen available under SHIFT-CTRL-X
+  * Disable high DPI scaling on incorrect EDID
+  * Fix handling of .iso files
+  * Update translations
+  * GUI: change "SD card" -> "Storage"
+  * Allow NVMe drives as destination drive (Linux only)
 
- -- Floris Bos <bos@je-eigen-domein.nl>  Fri, 15 Jan 2021 22:00:21 +0100
+ -- Floris Bos <bos@je-eigen-domein.nl>  Fri, 26 Feb 2021 14:32:21 +0100
 
 rpi-imager (1.5) unstable; urgency=medium
 
diff --git a/linux/linuxdrivelist.cpp b/linux/linuxdrivelist.cpp
index 8332f07..dce1119 100644
--- a/linux/linuxdrivelist.cpp
+++ b/linux/linuxdrivelist.cpp
@@ -126,6 +126,25 @@ namespace Drivelist
             }
             dp.removeAll("");
             d.description = dp.join(" ").toStdString();
+
+            /* Mark internal NVMe drives as non-system if not mounted
+               anywhere else than under /media */
+            if (d.isSystem && subsystems.contains("nvme"))
+            {
+                bool isMounted = false;
+                for (std::string mp : d.mountpoints)
+                {
+                    if (!QByteArray::fromStdString(mp).startsWith("/media/")) {
+                        isMounted = true;
+                        break;
+                    }
+                }
+                if (!isMounted)
+                {
+                    d.isSystem = false;
+                }
+            }
+
             deviceList.push_back(d);
         }