diff --git a/checkpoint_powersupply.mkp b/checkpoint_powersupply.mkp
index 818ab584954a5081def75765b67c86d369d4c975..b2633f067d99ebb4deb896c616024b283e1161c2 100644
Binary files a/checkpoint_powersupply.mkp and b/checkpoint_powersupply.mkp differ
diff --git a/checks/checkpoint_powersupply b/checks/checkpoint_powersupply
index 5c9de7b6152d83020015b6353c69a4fd4d1bc73a..2a1b6512291fed574eafdde379c4bbb6b8a71bd1 100644
--- a/checks/checkpoint_powersupply
+++ b/checks/checkpoint_powersupply
@@ -2,13 +2,17 @@
 # -*- encoding: utf-8; py-indent-offset: 4 -*-
 #
 #
-# Monitor status of Check Point appliance power supply
+# License: GNU General Public License v2
 #
-# Author: Th.L.
+# Author: thl-cmk[at]outlook[dot]com
+# URL   : https://thl-cmk.hopto.org
 # Date  : 2018-07-31
 #
-# 2018-07-31:
+# Monitor status of Check Point appliance power supply
+#
+# 2020-06-08: changed snmp-scan function
 #
+# ToDo: remove VSX...
 #
 # sample snmpwalk (two  power supplys)
 #
@@ -63,13 +67,9 @@ check_info['checkpoint_powersupply'] = {
     'default_levels_variable' : 'checkpoint_powersupply_defaults',
     'service_description'     : 'Power supply %s',
     'group'                   : 'cp_powersupply',
-    #'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0') in ['.1.3.6.1.4.1.2620.1.6.123.1.67',  # ClusterXL Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.65',  # Appliance
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.64',  # VSX Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.62',  # Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.49',  # R77.30 Gateway
-    #                                                                '.1.3.6.1.4.1.2620.1.6.123.1.48',  # Mgmt
-    'snmp_scan_function': lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1'),
+    'snmp_scan_function': lambda oid: (oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.2620.1.6.123.1') or
+                                       oid('.1.3.6.1.2.1.1.2.0').startswith('.1.3.6.1.4.1.8072.3.2.10')) and
+                                      oid('.1.3.6.1.4.1.2620.1.6.1.0', '').lower().startswith('svn foundation'),
     'snmp_info'               : ('.1.3.6.1.4.1.2620.1.6.7.9.1.1', [  # CHECKPOINT-MIB::powerSupplyEntry
                                   '1',   # powerSupplyIndex
                                   '2',   # powerSupplyStatus
diff --git a/packages/checkpoint_powersupply b/packages/checkpoint_powersupply
index 6d6d1db6d39f61b3942c7e4e78cda90f543dc76f..992276ab520254bf2ab6c1a5fa64ce288cb87358 100644
--- a/packages/checkpoint_powersupply
+++ b/packages/checkpoint_powersupply
@@ -7,4 +7,4 @@
  'title': u'Check Point power supply status',
  'version': '20180731.v0.0.1',
  'version.min_required': '1.2.8b8',
- 'version.packaged': '1.4.0p35'}
\ No newline at end of file
+ 'version.packaged': '1.4.0p38'}
\ No newline at end of file