diff --git a/repos/base-hw/patches/muen_ada-bfd.patch b/repos/base-hw/patches/muen_ada-bfd.patch
new file mode 100644
index 0000000000..dac0359d9c
--- /dev/null
+++ b/repos/base-hw/patches/muen_ada-bfd.patch
@@ -0,0 +1,29 @@
+diff --git a/contrib/ada-bfd/Makefile b/contrib/ada-bfd/Makefile
+index cd776781e..36c87b126 100644
+--- a/contrib/ada-bfd/Makefile
++++ b/contrib/ada-bfd/Makefile
+@@ -1,6 +1,6 @@
+-REV = afcd3c0e6f25c7bec7fe8f240c8376eaa2125b63
++REV = 1ee4c51befbda90360e519f5b76c17db124e2973
+ PKG = ada-bfd
+-SRC = https://github.com/stcarrez/ada-bfd.git
++SRC = https://github.com/skalk/ada-bfd.git
+ 
+ define CMD_CONFIGURE
+ 	cd $(WRK) && ./configure --prefix=$(BUILDDIR)
+diff --git a/contrib/projects/bfdada.gpr b/contrib/projects/bfdada.gpr
+index 8a9cd711a..6cbe14152 100644
+--- a/contrib/projects/bfdada.gpr
++++ b/contrib/projects/bfdada.gpr
+@@ -1,8 +1,8 @@
+ library project Bfdada is
+-   for Source_Dirs use ("../build/share/ada/adainclude/bfdada");
++   for Source_Dirs use ("../build/include/bfdada.static");
+    for Library_Name use "ada-bfd";
+-   for Library_Dir use "../build/lib";
+-   for Library_ALI_Dir use "../build/lib/ada/adalib/bfdada";
++   for Library_Dir use "../build/lib/bfdada.static";
++   for Library_ALI_Dir use "../build/lib/bfdada.static";
+    for Library_Kind use "static";
+    for Externally_Built use "true";
+ end Bfdada;
diff --git a/repos/base-hw/patches/muen_python2.patch b/repos/base-hw/patches/muen_python2.patch
new file mode 100644
index 0000000000..ee58641c42
--- /dev/null
+++ b/repos/base-hw/patches/muen_python2.patch
@@ -0,0 +1,31 @@
+diff --git a/projects/execute b/projects/execute
+index 43820f0ed..e2dbda43c 100755
+--- a/projects/execute
++++ b/projects/execute
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ #
+ # Build system execution wrapper.
+ #
+diff --git a/tools/scripts/mulog-subject.py b/tools/scripts/mulog-subject.py
+index cb6e355dd..51965a797 100755
+--- a/tools/scripts/mulog-subject.py
++++ b/tools/scripts/mulog-subject.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ from __future__ import print_function
+ 
+diff --git a/tools/scripts/mulog.py b/tools/scripts/mulog.py
+index 6d7fe8bb2..671913441 100755
+--- a/tools/scripts/mulog.py
++++ b/tools/scripts/mulog.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2
+ 
+ import sys
+ import re
+
diff --git a/repos/base-hw/ports/muen.hash b/repos/base-hw/ports/muen.hash
index 01db2d3960..aa9af20853 100644
--- a/repos/base-hw/ports/muen.hash
+++ b/repos/base-hw/ports/muen.hash
@@ -1 +1 @@
-6ee7754cd5edecc78df38a1d42dc2855ea3fcc0f
+0d6e25518f2ca7a986522bc61a713f516e5396d9
diff --git a/repos/base-hw/ports/muen.port b/repos/base-hw/ports/muen.port
index dc6ebe3cb3..fb2c92ef85 100644
--- a/repos/base-hw/ports/muen.port
+++ b/repos/base-hw/ports/muen.port
@@ -6,13 +6,16 @@ URL(muen) := https://git.codelabs.ch/git/muen.git
 REV(muen) := 76b75b5f859f14397d146c16e5411142a6af11d0
 DIR(muen) := src/kernel/muen
 
+PATCHES   := $(sort $(wildcard $(REP_DIR)/patches/muen_*.patch))
+PATCH_OPT := -p1 -d src/kernel/muen
+
 $(call check_tool,git)
 $(call check_tool,iasl)
 $(call check_tool,tidy)
 $(call check_tool,xsltproc)
 
 default : additional_steps
-additional_steps : $(DOWNLOADS)
+additional_steps : $(DOWNLOADS) _patch
 	$(VERBOSE)git -C src/kernel/muen submodule update --init tools/mugenschedcfg > /dev/null
 	$(VERBOSE)git -C src/kernel/muen submodule update --init components/libxhcidbg > /dev/null
 	$(VERBOSE)$(MAKE) -C src/kernel/muen/contrib QUIET=true download