diff -up sapconf-0.98/sapconf.recognize-rhsm-satellite sapconf-0.98/sapconf
--- sapconf-0.98/sapconf.recognize-rhsm-satellite	2016-08-31 22:30:50.867251534 +0200
+++ sapconf-0.98/sapconf	2016-08-31 22:32:00.044017094 +0200
@@ -671,7 +671,7 @@ fi
 # Checks if system is subscribed to RHEL for SAP Channel
 
 function check_rhn() {
-if yum repolist | grep -q rhel-$(uname -m)-server-sap; 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-rpms"; then
         out "RHEL system subscribed to RHEL for SAP channel ... OK"
 else
         out "RHEL system not subscribed to RHEL for SAP channel ... WARNING"
