diff --git a/openwrt-base-files.patch b/openwrt-base-files.patch
index d281d1c..ce4de4e 100644
--- a/openwrt-base-files.patch
+++ b/openwrt-base-files.patch
@@ -1,25 +1,14 @@
-Terrible hacks to avoid conflicts between base-files and systemd.
-
-Requires further discussion with upstream, not a patch submission!
-
-Signed-off-by: Jeff Waugh <jdub at bethesignal.org>
----
- Makefile |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index e0bf915..6f42f11 100644
---- a/package/base-files/Makefile
-+++ b/package/base-files/Makefile
-@@ -29,7 +29,6 @@ endif
+--- ./package/base-files/Makefile.orig	2015-11-30 11:23:32.027998990 -0800
++++ ./package/base-files/Makefile	2015-11-30 11:24:19.365973177 -0800
+@@ -31,7 +31,6 @@
  define Package/base-files
    SECTION:=base
    CATEGORY:=Base system
--  DEPENDS:=+netifd +libc +procd +jsonfilter
+-  DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign
    TITLE:=Base filesystem for OpenWrt
    URL:=http://openwrt.org/
    VERSION:=$(PKG_RELEASE)-$(REVISION)
-@@ -135,7 +134,7 @@ define Package/base-files/install
+@@ -156,7 +155,7 @@
  	mkdir -p $(1)/root
  	$(LN) /proc/mounts $(1)/etc/mtab
  	rm -f $(1)/var
diff --git a/openwrt-kernel-config.patch b/openwrt-kernel-config.patch
index ccc738c..23db0cc 100644
--- a/openwrt-kernel-config.patch
+++ b/openwrt-kernel-config.patch
@@ -1,14 +1,3 @@
-Add support for various kernel options required by systemd.
-c.f. http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild?&view=markup#l118
-
-Signed-off-by: Jeff Waugh <jdub at bethesignal.org>
-Signed-off-by: Adam Porter <porter.adam at gmail.com>
----
- config/Config-kernel.in |   20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/config/Config-kernel.in b/config/Config-kernel.in
-index a0bd13e..33d1e3c 100644
 --- a/config/Config-kernel.in
 +++ b/config/Config-kernel.in
 @@ -26,6 +26,26 @@ config KERNEL_DEBUG_FS