diff --git a/repos/ports-foc/config/android_config.arm b/repos/ports-foc/config/android_config.arm
index 1658f390b2..a500e63ec8 100644
--- a/repos/ports-foc/config/android_config.arm
+++ b/repos/ports-foc/config/android_config.arm
@@ -35,8 +35,9 @@ CONFIG_L4_PLATFORM_GENERIC=y
 # CONFIG_L4_NET_L4SHM is not set
 # CONFIG_L4_SERIAL is not set
 # CONFIG_L4_SERIAL_SHM is not set
-CONFIG_SCREEN_GENODE=y
-CONFIG_SERIAL_GENODE=y
+CONFIG_GENODE_SCREEN=y
+CONFIG_GENODE_SERIAL=y
+# CONFIG_GENODE_BALLOON is not set
 
 #
 # Debugging options
diff --git a/repos/ports-foc/config/android_config.x86_32 b/repos/ports-foc/config/android_config.x86_32
index 756cd18254..5213a9cb8f 100644
--- a/repos/ports-foc/config/android_config.x86_32
+++ b/repos/ports-foc/config/android_config.x86_32
@@ -34,8 +34,9 @@ CONFIG_PHYSICAL_START=0x0
 # CONFIG_L4_NET_L4SHM is not set
 # CONFIG_L4_SERIAL is not set
 # CONFIG_L4_SERIAL_SHM is not set
-CONFIG_SCREEN_GENODE=y
-CONFIG_SERIAL_GENODE=y
+CONFIG_GENODE_SCREEN=y
+CONFIG_GENODE_SERIAL=y
+# CONFIG_GENODE_BALLOON is not set
 
 #
 # Debugging options
diff --git a/repos/ports-foc/config/linux_config.arm b/repos/ports-foc/config/linux_config.arm
index 46093e798b..031af07802 100644
--- a/repos/ports-foc/config/linux_config.arm
+++ b/repos/ports-foc/config/linux_config.arm
@@ -35,8 +35,9 @@ CONFIG_L4_PLATFORM_GENERIC=y
 # CONFIG_L4_NET_L4SHM is not set
 # CONFIG_L4_SERIAL is not set
 # CONFIG_L4_SERIAL_SHM is not set
-CONFIG_SCREEN_GENODE=y
-CONFIG_SERIAL_GENODE=y
+CONFIG_GENODE_SCREEN=y
+CONFIG_GENODE_SERIAL=y
+CONFIG_GENODE_BALLOON=y
 
 #
 # Debugging options
diff --git a/repos/ports-foc/config/linux_config.x86_32 b/repos/ports-foc/config/linux_config.x86_32
index 94522d8c3a..db7dca6994 100644
--- a/repos/ports-foc/config/linux_config.x86_32
+++ b/repos/ports-foc/config/linux_config.x86_32
@@ -34,8 +34,9 @@ CONFIG_PHYSICAL_START=0x100000
 # CONFIG_L4_NET_L4SHM is not set
 # CONFIG_L4_SERIAL is not set
 # CONFIG_L4_SERIAL_SHM is not set
-CONFIG_SCREEN_GENODE=y
-CONFIG_SERIAL_GENODE=y
+CONFIG_GENODE_SCREEN=y
+CONFIG_GENODE_SERIAL=y
+CONFIG_GENODE_BALLOON=y
 
 #
 # Debugging options
diff --git a/repos/ports-foc/ports/l4android.hash b/repos/ports-foc/ports/l4android.hash
index b5cce0a73e..5ba50c9755 100644
--- a/repos/ports-foc/ports/l4android.hash
+++ b/repos/ports-foc/ports/l4android.hash
@@ -1 +1 @@
-cc3203080fe5e1c5029c47fd7f73fab76c71b9ed
+07d72c264878024efa078d14241f1648172a39de
diff --git a/repos/ports-foc/ports/l4android.port b/repos/ports-foc/ports/l4android.port
index 3fa3c3294f..f7b45d6bbb 100644
--- a/repos/ports-foc/ports/l4android.port
+++ b/repos/ports-foc/ports/l4android.port
@@ -1,11 +1,9 @@
 LICENSE        := GPLv2
 VERSION        := git
 DOWNLOADS      := l4android.git
-URL(l4android) := http://git.l4android.org/kernel
-REV(l4android) := bf83cc85e672bfafddc0fb85398129e427d6780f
+URL(l4android) := https://github.com/skalk/l4linux.git
+REV(l4android) := cea6e7ab97a5ad421e53d456dd940893d5a14866
 DIR(l4android) := src/l4android
-PATCH_OPT      := -p0 -d src/l4android
-PATCHES         = $(addprefix $(REP_DIR)/patches/,l4lx_genode.patch icmp_align.patch tcp_mem.patch android_binder.patch)
 sym_link       := src/l4android/arch/l4/drivers
 
 default: $(sym_link)
diff --git a/repos/ports-foc/ports/l4linux.hash b/repos/ports-foc/ports/l4linux.hash
index 570f4fcb44..dbb61ccbf6 100644
--- a/repos/ports-foc/ports/l4linux.hash
+++ b/repos/ports-foc/ports/l4linux.hash
@@ -1 +1 @@
-e431e60cfc9fe79a849f79353de2e49c4c8d123e
+60792b132cd767f53991729999939a28b742f74d
diff --git a/repos/ports-foc/ports/l4linux.port b/repos/ports-foc/ports/l4linux.port
index d857590a28..41dc84dabb 100644
--- a/repos/ports-foc/ports/l4linux.port
+++ b/repos/ports-foc/ports/l4linux.port
@@ -1,8 +1,8 @@
 LICENSE      := GPLv2
 VERSION      := git
 DOWNLOADS    := l4linux.git
-URL(l4linux) := https://github.com/ssumpf/l4linux.git
-REV(l4linux) := 75354b3f0f6ed7b9ebec118670213062c5a4c78e
+URL(l4linux) := https://github.com/skalk/l4linux.git
+REV(l4linux) := f2eebaebf7d304dec7eb49ca5b9a020603cf6cb6
 DIR(l4linux) := src/l4linux
 sym_link     := src/l4linux/arch/l4/drivers
 
diff --git a/repos/ports-foc/src/drivers/Makefile b/repos/ports-foc/src/drivers/Makefile
index d43339d8c9..d26248e03e 100644
--- a/repos/ports-foc/src/drivers/Makefile
+++ b/repos/ports-foc/src/drivers/Makefile
@@ -1,6 +1,6 @@
-obj-y                   += genode_serial.o
-obj-y                   += genode_balloon.o
-obj-$(CONFIG_RTC_CLASS) += genode_rtc.o
-obj-$(CONFIG_FB)        += genode_fb.o
-obj-$(CONFIG_BLOCK)     += genode_block.o
-obj-$(CONFIG_NET)       += genode_net.o
+obj-y                        += genode_serial.o
+obj-$(CONFIG_GENODE_BALLOON) += genode_balloon.o
+obj-$(CONFIG_RTC_CLASS)      += genode_rtc.o
+obj-$(CONFIG_FB)             += genode_fb.o
+obj-$(CONFIG_BLOCK)          += genode_block.o
+obj-$(CONFIG_NET)            += genode_net.o