diff --git a/README.md b/README.md
index b813828471786ced543bbcdeaad9a2e423a1b8e1..bcc86a6bb209293ab5402b6f8b37c95399828ba1 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/squid-2.0.4-2023-09-21.mkp "squid-2.0.4-2023-09-21.mkp"
 # Squid Web Proxy
 
 This CheckMK plugin monitors the performance of the _**Squid Web Proxy**_. This plugin is intended to use with the Agent Bakery of CheckMK.
diff --git a/agents/bakery/squid.py b/lib/python3/cmk/base/cee/plugins/bakery/squid.py
similarity index 84%
rename from agents/bakery/squid.py
rename to lib/python3/cmk/base/cee/plugins/bakery/squid.py
index dbaa8956ac24a76ae6d91325ec646f47c11edb14..23c3d7c5b2b502499671858b44fe30361d38fbb8 100755
--- a/agents/bakery/squid.py
+++ b/lib/python3/cmk/base/cee/plugins/bakery/squid.py
@@ -14,6 +14,8 @@
 # 2023-05-20: moved agent plugin from ~/local/share/check_mk/agents/plugins/linux
 #                                  to ~/local/share/check_mk/agents/plugins
 #             renamed bakery plugin from squid to squid.py
+# 2023-09-21: moved file to ~/local/lib/check_mk/base/cee/plugins/bakery
+#             fix crash if port not configured in wato
 
 from pathlib import Path
 from cmk.base.cee.plugins.bakery.bakery_api.v1 import (
@@ -33,7 +35,7 @@ def get_squid_files(conf) -> FileGenerator:
 
     yield PluginConfig(
         base_os=OS.LINUX,
-        lines=[f'port={conf["port"]}'],
+        lines=[f'port={conf.get("port", 3128)}'],
         target=Path('squid.cfg'),
         include_header=False,
     )
diff --git a/packages/squid b/packages/squid
index 96c84765a2f68a7400e7c3e3d13dc1cda54b7abb..7712d7ebbd5ca619551ddb7e019dc403278ffa7c 100644
--- a/packages/squid
+++ b/packages/squid
@@ -7,12 +7,13 @@
                 'Rewritten for CMK 2.1.x\n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['squid.py'],
-           'agents': ['bakery/squid.py', 'plugins/squid'],
+           'agents': ['plugins/squid'],
            'checkman': ['squid'],
-           'gui': ['wato/squid.py', 'metrics/squid.py']},
+           'gui': ['wato/squid.py', 'metrics/squid.py'],
+           'lib': ['python3/cmk/base/cee/plugins/bakery/squid.py']},
  'name': 'squid',
  'title': 'Squid3 Health Check',
- 'version': '2.0.3-2023-05-22',
+ 'version': '2.0.4-2023-09-21',
  'version.min_required': '2.1.0b1',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': None}
\ No newline at end of file
+ 'version.packaged': '2.2.0p7',
+ 'version.usable_until': None}
diff --git a/squid-2.0.4-2023-09-21.mkp b/squid-2.0.4-2023-09-21.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..ee884059f74f08d6a9ab8b1cceec1b5773e62d3c
Binary files /dev/null and b/squid-2.0.4-2023-09-21.mkp differ
diff --git a/squid.mkp b/squid.mkp
deleted file mode 100644
index fb912a247b4de607eef751901df98259ae2a2751..0000000000000000000000000000000000000000
Binary files a/squid.mkp and /dev/null differ