diff -up sapconf-0.98/sapconf.identify-e4s-sap-channel sapconf-0.98/sapconf
--- sapconf-0.98/sapconf.identify-e4s-sap-channel	2017-11-06 14:07:34.355278090 +0100
+++ sapconf-0.98/sapconf	2017-11-06 14:17:57.512727114 +0100
@@ -713,7 +713,7 @@ fi
 # Checks if system is subscribed to RHEL for SAP Channel
 
 function check_rhn() {
-if yum repolist | egrep -q "rhel-sap-for-rhel-7-server-eus-rpms|rhel-$(uname -m)-server-sap|rhel-sap-for-rhel-$(awk '{print $7}' /etc/redhat-release | cut -c -1)-server-rpms"; then
+if yum repolist | egrep -q "rhel-$(uname -m)-server-sap|rhel-sap-for-rhel-$(awk '{print $7}' /etc/redhat-release | cut -c -1)-server(-e4s|-eus)?-rpms"; then
         out "RHEL system subscribed to RHEL for SAP channel ... OK"
 else
         out "RHEL system not subscribed to RHEL for SAP channel ... WARNING"