diff --git a/bgp_peer-2.2.1-20230613.mkp b/bgp_peer-2.2.1-20230613.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..3c53f65ebcc6e1433c3b1812710ab6ee1af8f708
Binary files /dev/null and b/bgp_peer-2.2.1-20230613.mkp differ
diff --git a/bgp_peer.mkp b/bgp_peer.mkp
index 516ed8629448dc176edecabe4598ca217129752a..3c53f65ebcc6e1433c3b1812710ab6ee1af8f708 100644
Binary files a/bgp_peer.mkp and b/bgp_peer.mkp differ
diff --git a/gui/metrics/bgp_peer.py b/gui/metrics/bgp_peer.py
index 6db6b1677b107ec94e33c509400c5f7301b45317..483d0e02212a43d8d24757ddaa9c5a67e52d72ae 100644
--- a/gui/metrics/bgp_peer.py
+++ b/gui/metrics/bgp_peer.py
@@ -109,6 +109,22 @@ metric_info['bgp_peer_out_prefixes'] = {
     'color': '41/a',
 }
 
+# Hawei spezific metrics
+metric_info['bgp_peer_prefixrcvcounter'] = {
+    'title': _('Prefixes received'),
+    'unit': 'count',
+    'color': '11/a',
+}
+metric_info['bgp_peer_prefixactivecounter'] = {
+    'title': _('Prefixes active'),
+    'unit': 'count',
+    'color': '33/a',
+}
+metric_info['bgp_peer_prefixadvcounter'] = {
+    'title': _('Prefixes advertised'),
+    'unit': 'count',
+    'color': '43/a',
+}
 
 ######################################################################################################################
 #
@@ -196,6 +212,17 @@ graph_info['bgp_peer.juniper_prefixes'] = {
     ],
 }
 
+# huawei prefixes
+graph_info['huawei_bgp_peer_counter'] = {
+    'title': _('BGP prefix counter'),
+    'metrics': [
+        ('bgp_peer_prefixrcvcounter', 'line'),
+        ('bgp_peer_prefixactivecounter', 'line'),
+        ('bgp_peer_prefixadvcounter', 'line'),
+    ]
+}
+
+
 ######################################################################################################################
 #
 # define perf-o-meter for bgp peer uptime + prefixes accepted/advertised
diff --git a/gui/wato/check_parameters/inv_bgp_peer.py b/gui/wato/check_parameters/inv_bgp_peer.py
index f4832c661908036a3d309eb0b9f13b8dcba7db90..e728182a2fddb8aa1d85e7c0a63a8e99bc2dfafa 100644
--- a/gui/wato/check_parameters/inv_bgp_peer.py
+++ b/gui/wato/check_parameters/inv_bgp_peer.py
@@ -8,6 +8,8 @@
 # 2022-04-24: added option for BGP down time
 #             added option to remove some columns from inventory
 # 2022-04-28: added Whois options
+# 2023-06-12: moved wato file from ~local/lib/check_mk/gui/plugins/wato
+#             to ~/local/lib/check_mk/gui/plugins/wato/check_parameters
 
 from cmk.gui.i18n import _
 from cmk.gui.plugins.wato.utils import (
diff --git a/packages/bgp_peer b/packages/bgp_peer
index f7c703172b9df97c24863bef6ee2d03f72508143..80fcc2625d80db1af78684b0286aff2c23f90929 100644
--- a/packages/bgp_peer
+++ b/packages/bgp_peer
@@ -1,13 +1,31 @@
 {'author': 'Th.L. (thl-cmk[at]outlook[dot]com)',
- 'description': 'based on BGP Peer State Check by Thomas Wollner\n'
+ 'description': 'based on BGP Peer State Check by Thomas Wollner (see '
+                'https://exchange.checkmk.com/p/bgp-peer)\n'
                 '\n'
-                'Rewritten for CMK 2.0 by thl-cmk[at]outlook[dot]com\n'
+                'Rewritten for CMK 2.x by thl-cmk[at]outlook[dot]com\n'
                 '\n'
-                '- Moved static information from check plugin to inventory\n'
+                'This plugin uses the standard BGP4 MIB to monitor BGP peers. '
+                'The plugin consists of two parts\n'
+                '- the bgp_peer check plugin\n'
+                '- the inv_bgp_peer inventory plugin\n'
                 '\n'
-                '2021-11-08: added helper functions from cisco_bgp_peer\n'
-                '2021-11-14: merged with cisco_bgp_peer\n'
-                '2022-04-18: merged with huawei_bgp_peer\n',
+                'performance data include\n'
+                '    FMS last change/transitions\n'
+                '    Last update received\n'
+                '    Peer uptime\n'
+                '    Total messages received/send\n'
+                '    Updates received/send\n'
+                '\n'
+                'It is the base for my other vendor specific BGP peer checks:\n'
+                '- Arista: '
+                'https://thl-cmk.hopto.org/gitlab/checkmk/arista_networks/arista_bgp_peer\n'
+                '- Cisco: '
+                'https://thl-cmk.hopto.org/gitlab/checkmk/cisco/cisco_bgp_peer\n'
+                '- Huawei: '
+                'https://thl-cmk.hopto.org/gitlab/checkmk/huawei/huawei_bgp_peer\n'
+                '- Juniper: '
+                'https://thl-cmk.hopto.org/gitlab/checkmk/juniper-networks/juniper_bgp_peer\n'
+                '\n',
  'download_url': 'https://thl-cmk.hopto.org/vendor-independent/bgp_peer',
  'files': {'agent_based': ['bgp_peer.py',
                            'inv_bgp_peer.py',
@@ -19,7 +37,7 @@
                    'wato/check_parameters/inv_bgp_peer.py']},
  'name': 'bgp_peer',
  'title': 'BGP Peer',
- 'version': '2.2.1-20230612',
+ 'version': '2.2.1-20230613',
  'version.min_required': '2.2.0b1',
  'version.packaged': '2.2.0p2',
  'version.usable_until': None}