diff --git a/atop-sysconfig.patch b/atop-sysconfig.patch
new file mode 100644
index 0000000..aabc017
--- /dev/null
+++ b/atop-sysconfig.patch
@@ -0,0 +1,12 @@
+--- atop.daily~	2017-03-25 04:00:03.000000000 -0500
++++ atop.daily	2017-12-08 09:56:09.231136938 -0600
+@@ -6,6 +6,9 @@
+ PIDFILE=/var/run/atop.pid
+ INTERVAL=600				# interval 10 minutes
+ 
++# support /etc/sysconfig/atop
++source /etc/sysconfig/atop
++
+ # verify if atop still runs for daily logging
+ #
+ if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
diff --git a/atop.spec b/atop.spec
index ebe812f..8683382 100644
--- a/atop.spec
+++ b/atop.spec
@@ -2,7 +2,7 @@
 
 Name:           atop
 Version:        2.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An advanced interactive monitor to view the load on system and process level
 
 Group:          Applications/System
@@ -16,7 +16,8 @@ Source5:        atop.d
 #Source6:        atop.service
 Source7:        README.fedora
 
-#Patch0:         atop-1.26-cron.patch
+Patch0:         nvme_support.patch
+Patch1:         atop-sysconfig.patch
 
 BuildRequires:  zlib-devel
 BuildRequires:  ncurses-devel 
@@ -47,7 +48,8 @@ http://www.atcomputing.nl/Tools/atop/kernpatch.html
  
 %prep
 %setup -q
-#%patch0 -p1 -b .cron
+%patch0 -p0 -b .nvme
+%patch1 -p0 -b .sysconfig
 
 
 %build
@@ -101,6 +103,10 @@ install -m 0644 %{SOURCE7} .
 %{_datadir}/atop/atop.daily
 
 %changelog
+* Fri Dec 08 2017 Gwyn Ciesla <limburgher@gmail.com> - 2.3.0-5
+- Patch to support nvme disks, BZ 1523419.
+- Patch to support /etc/sysconfig/atop, BZ 1520475.
+
 * Tue Nov 07 2017 Gwyn Ciesla <limburgher@gmail.com> - 2.3.0-4
 - Move from logrotate to upstream script.
 
diff --git a/nvme_support.patch b/nvme_support.patch
new file mode 100644
index 0000000..bc144a6
--- /dev/null
+++ b/nvme_support.patch
@@ -0,0 +1,11 @@
+diff -up ./photosyst.c.orig ./photosyst.c
+--- ./photosyst.c.orig	2017-03-25 11:00:03.000000003 +0200
++++ ./photosyst.c	2017-12-08 01:31:13.795157092 +0200
+@@ -1537,6 +1537,7 @@ static struct {
+ 	{ "^dasd[a-z][a-z]*$",			{0},  nullmodname, DSKTYPE, },
+ 	{ "^mmcblk[0-9][0-9]*$",		{0},  nullmodname, DSKTYPE, },
+ 	{ "^emcpower[a-z][a-z]*$",		{0},  nullmodname, DSKTYPE, },
++	{ "^nvme[0-9][a-z][0-9]*$",		{0},  nullmodname, DSKTYPE, },
+ };
+ 
+ static int