diff --git a/agent_based/inv_cisco_wlc_ap_cdp_cache.py b/agent_based/inv_cisco_wlc_ap_cdp_cache.py
index 83d348e60475bd6f89df86966ca7a8828e912d07..c0f1c9873f0ac39358302e4e56689a341b170475 100644
--- a/agent_based/inv_cisco_wlc_ap_cdp_cache.py
+++ b/agent_based/inv_cisco_wlc_ap_cdp_cache.py
@@ -14,12 +14,15 @@
 # 2018-09-04: changes for CMK 1.5.x (inv_tree --> inv_tree_list)
 # 2020-03-15: added support for CMK1.6x
 # 2021-07-10: rewritten vor CMK 2.0
+# 2021-07-15 : added support for Catalyst 9800 Controllers
+
 
 from cmk.base.plugins.agent_based.agent_based_api.v1 import (
     register,
     SNMPTree,
     TableRow,
     contains,
+    any_of,
 )
 from cmk.base.plugins.agent_based.agent_based_api.v1.type_defs import (
     StringTable,
@@ -168,7 +171,10 @@ register.snmp_section(
             '16',  # clcCdpApCacheInterfaceSpeed
         ]
     ),
-    detect=contains('.1.3.6.1.2.1.1.1.0', 'Cisco Controller'),  # sysDescr
+    detect=any_of(
+        contains('.1.3.6.1.2.1.1.1.0', 'Cisco Controller'),  # sysDescr
+        contains('.1.3.6.1.2.1.1.1.0', 'C9800 Software'),  # sysDescr
+    )
 )
 
 register.inventory_plugin(
diff --git a/inv_cisco_wlc_ap_cdp_cache.mkp b/inv_cisco_wlc_ap_cdp_cache.mkp
index 767ec8c5b1c516627285302bfa18e2f80d50ab5e..608988f58c9dd5bf9a891165a741afc13023241b 100644
Binary files a/inv_cisco_wlc_ap_cdp_cache.mkp and b/inv_cisco_wlc_ap_cdp_cache.mkp differ
diff --git a/packages/inv_cisco_wlc_ap_cdp_cache b/packages/inv_cisco_wlc_ap_cdp_cache
index 829889e934cafc124b8cb38528d517730f2e1a5f..fc44e6bfb64e8d16dbb3288d91d977f83f8b1f33 100644
--- a/packages/inv_cisco_wlc_ap_cdp_cache
+++ b/packages/inv_cisco_wlc_ap_cdp_cache
@@ -18,5 +18,5 @@
  'title': 'inventory for Cisco WLC AP CDP cache (CISCO-LWAPP-CDP-MIB)',
  'version': '20210710.v0.3',
  'version.min_required': '2.0.0',
- 'version.packaged': '2021.04.10',
+ 'version.packaged': '2021.07.14',
  'version.usable_until': None}
\ No newline at end of file
diff --git a/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py b/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
index 78fce03e504dcf06a72acfe91aa9bea1a9212365..8d797bf4e06f135971aa92fb420dc41a34c0a6cd 100644
--- a/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
+++ b/web/plugins/wato/inv_cisco_wlc_ap_cdp_cache.py
@@ -19,7 +19,7 @@ from cmk.gui.plugins.wato.inventory import (
     RulespecGroupInventory,
 )
 
-_removecolumns = [
+_removecolumns_cisco_wlc_ap_cdp_cache = [
     ('duplex', 'Duplex'),
     ('speed', 'Speed'),
 ]
@@ -46,7 +46,7 @@ def _valuespec_inv_cisco_wlc_ap_cdp_cache():
              ListChoice(
                  title=_('List of columns to remove'),
                  help=_('information to remove from inventory'),
-                 choices=_removecolumns,
+                 choices=_removecolumns_cisco_wlc_ap_cdp_cache,
                  default_value=[],
              )),
             ('use_short_if_name',