diff --git a/.gitmodules b/.gitmodules
index 36dc482..30ee10c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "buildroot"]
 	path = buildroot
 	url = https://github.com/Telos4/buildroot.git
-[submodule "door_control"]
-	path = door_control
-	url = ssh://irgit@imaginaerraum.de:2201/apo/DoorControl.git
diff --git a/Makefile b/Makefile
index 666f87a..5abc2cc 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ sdcard.img: buildroot/.config
 	make -C buildroot all
 	cp buildroot/output/images/sdcard.img sdcard.img
 
-root_overlay: root_overlay/bin/door.py
 root_overlay: root_overlay/etc/door_tokens
 root_overlay: root_overlay/etc/dropbear/dropbear_ecdsa_host_key
 root_overlay: root_overlay/etc/wpa_supplicant/wpa_supplicant.conf
@@ -29,10 +28,6 @@ root_overlay/root/key:
 	mkdir -p `dirname $@`
 	dd if=/dev/urandom of=$@ bs=1 count=16
 
-root_overlay/bin/door.py: door_control/door.py
-	mkdir -p `dirname $@`
-	cp $< $@
-
 root_overlay/etc/dropbear/dropbear_ecdsa_host_key:
 	sh -c 'if [[ ! -f $@ && ! -f $@.openssh ]]; then mkdir -p `dirname $@` && ssh-keygen -t ecdsa -f $@.openssh; fi'
 
@@ -45,7 +40,6 @@ clean:
 	make -C buildroot clean
 	rm -f sdcard.img
 	rm -f root_overlay/root/.ssh/authorized_keys
-	rm -f root_overlay/bin/door.py
 
 menuconfig: buildroot/.config
 	make -C buildroot menuconfig
diff --git a/br_external/Config.in b/br_external/Config.in
index e10c460..204cb93 100644
--- a/br_external/Config.in
+++ b/br_external/Config.in
@@ -1,3 +1,4 @@
 source "$BR2_EXTERNAL_DOOR_PI_PATH/package/poll_desfire/Config.in"
 source "$BR2_EXTERNAL_DOOR_PI_PATH/package/libfreefare_git/Config.in"
 source "$BR2_EXTERNAL_DOOR_PI_PATH/package/python-door-admin/Config.in"
+source "$BR2_EXTERNAL_DOOR_PI_PATH/package/door_pi_control/Config.in"
diff --git a/br_external/package/door_pi_control/Config.in b/br_external/package/door_pi_control/Config.in
new file mode 100644
index 0000000..2e70822
--- /dev/null
+++ b/br_external/package/door_pi_control/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_DOOR_PI_CONTROL
+    bool "door_pi_control"
+    select BR2_PACKAGE_PYTHON3
+    select BR2_PACKAGE_PYTHON_PAHO_MQTT
+    select BR2_PACKAGE_PYTHON_SERIAL
+    help
+        https://git.imaginaerraum.de/apo/DoorControl
diff --git a/br_external/package/door_pi_control/door_pi_control.mk b/br_external/package/door_pi_control/door_pi_control.mk
new file mode 100644
index 0000000..47d1cea
--- /dev/null
+++ b/br_external/package/door_pi_control/door_pi_control.mk
@@ -0,0 +1,8 @@
+DOOR_PI_CONTROL_VERSION = d7fc4e366bf2354700b86c0cd0d8319ed9ce37fd
+DOOR_PI_CONTROL_SOURCE = $(DOOR_PI_CONTROL_VERSION).tar.gz
+DOOR_PI_CONTROL_SITE = https://git.imaginaerraum.de/apo/DoorControl/archive
+DOOR_PI_CONTROL_LICENSE = GPL-3.0
+DOOR_PI_CONTROL_LICENSE_FILES = LICENSE
+DOOR_PI_CONTROL_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/config b/config
index d8335aa..3401d51 100644
--- a/config
+++ b/config
@@ -4824,3 +4824,4 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_PACKAGE_POLL_DESFIRE=y
 BR2_PACKAGE_LIBFREEFARE_GIT=y
 BR2_PACKAGE_PYTHON_DOOR_ADMIN=y
+BR2_PACKAGE_DOOR_PI_CONTROL=y
diff --git a/door_control b/door_control
deleted file mode 160000
index 0982a21..0000000
--- a/door_control
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0982a213dd055f3a5dba18c08bf7b9a730386a95