diff --git a/media-libs/raspberrypi-userland/Manifest b/media-libs/raspberrypi-userland/Manifest
index c70e20d..a69c537 100644
--- a/media-libs/raspberrypi-userland/Manifest
+++ b/media-libs/raspberrypi-userland/Manifest
@@ -1,7 +1,8 @@
 AUX 92-local-vchiq-permissions.rules 142 BLAKE2B 962d9eb744717cf7a685fb7ab8a0e68f964a3ca7c0d49d2b93102d66bb3d20d84a433097fc7b510f609b8b762ae0f7ede32954b9c2ec055d5dbaa4d07b06af81 SHA512 b0e430adf65ccde1c3199c59e876293ffa1821a70f7d60057bb4990108fe21604e6d8c11dbdd74de50ad1fd5fad5e579ad35fb172a62ccef26bd2ff9bed5aba4
 AUX raspberrypi-userland-include.patch 1484 BLAKE2B 7563874b54b168bd4858ecb65112ef48a7e010feae7a68c22f6d3f47dc1b855222df124df808fd6be427fea5763a9afd4c55ae2e3223c7bd55aa95333e55fe88 SHA512 fe73bcd1182b36e8ccaf81f0d7717f299a482545f08b352af8ead80f134a7be0f5269adb6972a1979a390046b9b94cab55c7a50a493740c72c5084e0e4995baf
 AUX raspberrypi-userland-libdir.patch 12348 BLAKE2B ed0dcc454b13589244204cf2cb26d9e38b75887c2d4d1ec4db02e7d4a206661f0ae4fc9d06467e353310a6b69f49a72a53b2882acab6a3959d57c7c0d34434b5 SHA512 213f04d859a0134143cf0e98650ed69096934c1600577d28bb24d62272f9da7ca12d0f3b59a19d3ff06a5fc67547f8e5a8684738b534bfa6e429722b320fee9f
+AUX raspberrypi-userland-libfdt-static.patch 724 BLAKE2B 1e2901c69d9bf855c1db9e7f5776041d9d83e9e3025a31ab54fa136bfd67dd944ed631017de33ef15a948324b1392711fb2535b65fea4e4d5a59177b866114ea SHA512 1841061596a98157d7ed25f358e5d63d78f7f808f777b909c271c0b4aa9b45c4dfa498d5623bc53466d9b81e5c064ae45423910d180816b7e39563cedb1809d8
 DIST raspberrypi-userland-0_pre20201022.tar.gz 32957266 BLAKE2B b2f3b276db25f9185ac4c5db3ceb1e76b785e4692c724c4ec2442cb3dd7552ca612536f87852eb3b7561187bf6bb3552c46325f7dde90a0f82f68300ea67cc21 SHA512 12e66b2ba23a927ac09226c5f9a9300e83b0cf9935cccba95be1eaf7149b1ae55db0241a1fde95986af935478fba31e2021160daa1ed600d949e8c3f0452c50f
-EBUILD raspberrypi-userland-0_pre20201022.ebuild 1728 BLAKE2B fd8f983eff9e2415fb311af04ee893335284987ce291dedc68057f91dc9c3d06798e47c5f9c1c56d208c2e9ddb86d06da4582d185c241f3851e8050c161b7095 SHA512 c0be9df9f15a0432b3c6ee25d21d054d448ce62cced2832eadbdb687023c6fb8f348a7a06bff71d516e10027e8281b1897d9800d9f51b59e9b7af4cf3cbfc9a9
-EBUILD raspberrypi-userland-9999.ebuild 1728 BLAKE2B fd8f983eff9e2415fb311af04ee893335284987ce291dedc68057f91dc9c3d06798e47c5f9c1c56d208c2e9ddb86d06da4582d185c241f3851e8050c161b7095 SHA512 c0be9df9f15a0432b3c6ee25d21d054d448ce62cced2832eadbdb687023c6fb8f348a7a06bff71d516e10027e8281b1897d9800d9f51b59e9b7af4cf3cbfc9a9
+EBUILD raspberrypi-userland-0_pre20201022.ebuild 1720 BLAKE2B 59ed8e6e01165bb8b93e7ef0dc5497799b1cd777a53e880ad0060f78a9a7947b6f6065117f069f618e44fa478b745fe0d5e9186745a301b10cd02a17ca7255b1 SHA512 556fc375642c69779c0d01ec75a137466b54740bac0266e4902c5d198cefc99fd357d44173eb13d392b284a0e268efc8cbecf7c4ccf447c34f2ebfd3b95257bd
+EBUILD raspberrypi-userland-9999.ebuild 1720 BLAKE2B 59ed8e6e01165bb8b93e7ef0dc5497799b1cd777a53e880ad0060f78a9a7947b6f6065117f069f618e44fa478b745fe0d5e9186745a301b10cd02a17ca7255b1 SHA512 556fc375642c69779c0d01ec75a137466b54740bac0266e4902c5d198cefc99fd357d44173eb13d392b284a0e268efc8cbecf7c4ccf447c34f2ebfd3b95257bd
 MISC metadata.xml 351 BLAKE2B ba576d7f61b104574b6a6691584dd75e632a637ded0bce055a267822a86574e35a6d71f5bb3616939af1a964aa007cbe49fd5cf3b64939b387dc0d46d356fc82 SHA512 f0d9ddcb8e1e7df5ff767f33824c5f2b6ab5a9afc508e1d39864a046f2ffc05665011a1a08e2624dd41d6e1c150ed0d14ce888401cb5c52069eb4a8958d167e2
diff --git a/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch
new file mode 100644
index 0000000..7ba0cd0
--- /dev/null
+++ b/media-libs/raspberrypi-userland/files/raspberrypi-userland-libfdt-static.patch
@@ -0,0 +1,22 @@
+From 55999626af756874012f0163718152a77b14ff51 Mon Sep 17 00:00:00 2001
+From: crabbed halo ablution
+ <17379795+crabbedhaloablution@users.noreply.github.com>
+Date: Sun, 8 Nov 2020 13:49:09 +0100
+Subject: [PATCH] Make explicit that libfdt should be built static
+
+---
+ opensrc/helpers/libfdt/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opensrc/helpers/libfdt/CMakeLists.txt b/opensrc/helpers/libfdt/CMakeLists.txt
+index f57c61cb..fad86d32 100755
+--- a/opensrc/helpers/libfdt/CMakeLists.txt
++++ b/opensrc/helpers/libfdt/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories(.)
+ 
+-add_library(fdt
++add_library(fdt STATIC
+             fdt.c 
+             fdt_empty_tree.c
+             fdt_ro.c
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
index d72f1fa..ceeec0d 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-0_pre20201022.ebuild
@@ -37,6 +37,8 @@ RDEPEND="acct-group/video
 PATCHES=( "${FILESDIR}/${PN}-libdir.patch" )
 #Don't install includes that collide.
 PATCHES+=( "${FILESDIR}/${PN}-include.patch" )
+#See https://github.com/raspberrypi/userland/pull/655
+PATCHES+=( "${FILESDIR}/${PN}-libfdt-static.patch" )
 
 pkg_setup() {
 	append-ldflags $(no-as-needed)
@@ -52,9 +54,6 @@ src_prepare() {
 	sed -i \
 		-e 's:DESTINATION ${VMCS_INSTALL_PREFIX}/src:DESTINATION ${VMCS_INSTALL_PREFIX}/'"share/doc/${PF}:" \
 		"${S}/makefiles/cmake/vmcs.cmake" || die "Failed sedding makefiles/cmake/vmcs.cmake"
-	sed -i \
-		-e 's:add_library(fdt:add_library(fdt STATIC:' \
-		"${S}/opensrc/helpers/libfdt/CMakeLists.txt" || die
 }
 
 src_install() {
diff --git a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
index d72f1fa..ceeec0d 100644
--- a/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
+++ b/media-libs/raspberrypi-userland/raspberrypi-userland-9999.ebuild
@@ -37,6 +37,8 @@ RDEPEND="acct-group/video
 PATCHES=( "${FILESDIR}/${PN}-libdir.patch" )
 #Don't install includes that collide.
 PATCHES+=( "${FILESDIR}/${PN}-include.patch" )
+#See https://github.com/raspberrypi/userland/pull/655
+PATCHES+=( "${FILESDIR}/${PN}-libfdt-static.patch" )
 
 pkg_setup() {
 	append-ldflags $(no-as-needed)
@@ -52,9 +54,6 @@ src_prepare() {
 	sed -i \
 		-e 's:DESTINATION ${VMCS_INSTALL_PREFIX}/src:DESTINATION ${VMCS_INSTALL_PREFIX}/'"share/doc/${PF}:" \
 		"${S}/makefiles/cmake/vmcs.cmake" || die "Failed sedding makefiles/cmake/vmcs.cmake"
-	sed -i \
-		-e 's:add_library(fdt:add_library(fdt STATIC:' \
-		"${S}/opensrc/helpers/libfdt/CMakeLists.txt" || die
 }
 
 src_install() {