diff --git a/.gitmodules b/.gitmodules
index fee39b8..6804178 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "userland"]
-	path = userland
-	url = https://github.com/raspberrypi/userland.git
 [submodule "FFmpeg"]
 	path = FFmpeg
 	url = https://github.com/cgutman/FFmpeg.git
diff --git a/Dockerfile.buster.armhf b/Dockerfile.buster.armhf
index 3568ad4..24313fe 100644
--- a/Dockerfile.buster.armhf
+++ b/Dockerfile.buster.armhf
@@ -3,12 +3,15 @@ FROM arm32v7/debian:buster
 RUN set -ex && \
     export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
-    apt-get install -y g++ make devscripts debhelper coreutils git wget nasm cmake libv4l-dev && \
-    apt-get install -y libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev wayland-protocols libopus-dev libva-dev libvdpau-dev libsdl2-dev libsdl2-ttf-dev && \
+    apt-get install -y --no-install-recommends gnupg && \
+    echo "deb http://archive.raspberrypi.org/debian/ buster main" >> /etc/apt/sources.list && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 82B129927FA3303E && \
+    apt-get update && \
+    apt-get install -y g++ make devscripts fakeroot debhelper git nasm && \
+    apt-get install -y --no-install-recommends libraspberrypi-dev libssl-dev qtbase5-dev qtquickcontrols2-5-dev qtdeclarative5-dev libqt5svg5-dev libgl1-mesa-dev libegl1-mesa-dev libxkbcommon-dev wayland-protocols libopus-dev libva-dev libvdpau-dev libsdl2-dev libsdl2-ttf-dev && \
     apt-get clean -y && \
     rm -rf /var/lib/apt/lists/*
 
-COPY userland /opt/userland
 COPY FFmpeg /opt/FFmpeg
 
 COPY scripts/build-deps.sh /opt/scripts/
diff --git a/debian/control b/debian/control
index 17a0848..5599ef1 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Cameron Gutman <aicommander@gmail.com>
 Section: misc
 Priority: optional
 Standards-Version: 4.3.0
-Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libgl1-mesa-dev, libegl1-mesa-dev, libxkbcommon-dev, wayland-protocols, libopus-dev, libva-dev, libvdpau-dev, libsdl2-dev, libsdl2-ttf-dev 
+Build-Depends: debhelper (>= 10), libssl-dev, qtbase5-dev, qtquickcontrols2-5-dev, qtdeclarative5-dev, libqt5svg5-dev, libgl1-mesa-dev, libegl1-mesa-dev, libxkbcommon-dev, wayland-protocols, libopus-dev, libva-dev, libvdpau-dev, libsdl2-dev, libsdl2-ttf-dev, libraspberrypi-dev [armhf] | rbp-userland-dev-osmc [armhf]
 
 Package: moonlight
 Architecture: any
diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh
index 7fa0487..ca4e6bb 100755
--- a/scripts/build-deps.sh
+++ b/scripts/build-deps.sh
@@ -5,14 +5,6 @@ BASE_FFMPEG_ARGS="--enable-pic --enable-static --disable-shared --disable-all --
 ARCH=`uname -m`
 echo "Building dependencies for $ARCH"
 if [ "$ARCH" == "armv7l" ]; then
-    # We need to link against some Raspberry Pi userland binaries
-    cd /opt/userland
-    mkdir build
-    cd build
-    cmake -DARM64=0 -DVMCS_INSTALL_PREFIX=/usr ..
-    make -j$(nproc)
-    make install
-
     # Enable MMAL decoders
     EXTRA_FFMPEG_ARGS="--enable-mmal --enable-decoder=h264_mmal"
 elif [ "$ARCH" == "aarch64" ]; then
diff --git a/userland b/userland
deleted file mode 160000
index 06bc6da..0000000
--- a/userland
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 06bc6daa02137ca72b7a2104afad81e82a44de17