diff --git a/docker-setup.sh b/docker-setup.sh
index 0e311ae..dd3851f 100755
--- a/docker-setup.sh
+++ b/docker-setup.sh
@@ -1,4 +1,3 @@
 #!/bin/bash
 
 python3 -m pip install -r requirements.txt
-python3 -m pip install cocotbext-wishbone/
diff --git a/env-setup.sh b/env-setup.sh
deleted file mode 100755
index 38e78d9..0000000
--- a/env-setup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ ! -d cocotbext-wishbone/.git ]; then
-  git clone https://github.com/wallento/cocotbext-wishbone.git
-  cd cocotbext-wishbone && patch < ../setup.py.patch
-  cd ..
-fi
diff --git a/requirements.txt b/requirements.txt
index ff45dd3..7061c1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ cocotbext-pcie
 cocotbext-eth
 cocotbext-uart
 cocotbext-spi
+cocotbext-wishbone
 
 # verification libraries
 cocotb-coverage
diff --git a/setup.py.patch b/setup.py.patch
deleted file mode 100644
index 9273f8a..0000000
--- a/setup.py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- setup.py	2022-02-07 11:35:49.632921471 +0100
-+++ setup.py.new	2022-02-07 11:40:11.084930778 +0100
-@@ -5,19 +5,13 @@
- 
- setuptools.setup(
-     name="cocotbext-wishbone",
--    use_scm_version={
--        "relative_to": __file__,
--        "write_to": "cocotbext/wishbone/version.py",
--    },
-+    version="0.2.1",
-     author="Staf Verhaegen, Mathias Kreider",
-     author_email="staf@stafverhaegen.be, m.kreider@gsi.de",
-     description="Cocotb Wishbone modules",
-     long_description=long_description,
-     packages=["cocotbext.wishbone"],
-     install_requires=['cocotb>=1.6.0', 'cocotb_bus'],
--    setup_requires=[
--        'setuptools_scm',
--    ],
-     classifiers=[
-         "Programming Language :: Python :: 3",
-         "License :: OSI Approved :: BSD License",