diff --git a/repos/base-sel4/recipes/src/base-sel4/README b/repos/base-sel4/recipes/src/base-sel4-wand_quad/README
similarity index 100%
rename from repos/base-sel4/recipes/src/base-sel4/README
rename to repos/base-sel4/recipes/src/base-sel4-wand_quad/README
diff --git a/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk b/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk
new file mode 100644
index 000000000..b0c04f7e6
--- /dev/null
+++ b/repos/base-sel4/recipes/src/base-sel4-wand_quad/content.mk
@@ -0,0 +1,47 @@
+include $(GENODE_DIR)/repos/base/recipes/src/base_content.inc
+
+
+TIMER_SRC := main.cc target.inc epit include
+
+content: enable_board_spec
+enable_board_spec: etc/specs.conf
+	echo "SPECS += wand_quad" >> etc/specs.conf
+
+content: src/drivers/timer
+src/drivers/timer:
+	mkdir -p $@
+	cp -r $(addprefix $(GENODE_DIR)/repos/os/$@/,$(TIMER_SRC)) $@
+
+content: include/spec/arm_v7/trace/timestamp.h include/os/attached_mmio.h
+
+include/%.h:
+	mkdir -p $(dir $@)
+	cp $(GENODE_DIR)/repos/os/$@ $@
+
+content: README
+README:
+	cp $(REP_DIR)/recipes/src/base-sel4-wand_quad/README $@
+
+content: lib/import etc include/sel4
+lib/import etc include/sel4:
+	$(mirror_from_rep_dir)
+
+content: src/tool/elfloader
+src/kernel:
+	$(mirror_from_rep_dir)
+
+KERNEL_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sel4)
+
+src/kernel/sel4: src/kernel
+	cp -r $(KERNEL_PORT_DIR)/src/kernel/sel4/* $@
+
+ELFLOADER_PORT_DIR := $(call port_dir,$(REP_DIR)/ports/sel4_elfloader)
+src/tool/elfloader: src/kernel/sel4
+	mkdir -p $@
+	cp -r $(ELFLOADER_PORT_DIR)/src/tool/elfloader/* $@
+
+content:
+	mv lib/mk/spec/arm/ld-sel4.mk lib/mk/spec/arm/ld.mk;
+	sed -i "s/ld-sel4/ld/"          src/lib/ld/sel4/target.mk
+	sed -i "s/wand_quad_timer_drv/timer/" src/drivers/timer/epit/wand_quad/target.mk
+
diff --git a/repos/base-sel4/recipes/src/base-sel4-wand_quad/hash b/repos/base-sel4/recipes/src/base-sel4-wand_quad/hash
new file mode 100644
index 000000000..c8bd7e925
--- /dev/null
+++ b/repos/base-sel4/recipes/src/base-sel4-wand_quad/hash
@@ -0,0 +1 @@
+2018-12-03 232f0021c9b4ae7a68cd0d6f468afc3da914d028
diff --git a/repos/base-sel4/recipes/src/base-sel4/used_apis b/repos/base-sel4/recipes/src/base-sel4-wand_quad/used_apis
similarity index 100%
rename from repos/base-sel4/recipes/src/base-sel4/used_apis
rename to repos/base-sel4/recipes/src/base-sel4-wand_quad/used_apis
diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/README b/repos/base-sel4/recipes/src/base-sel4-x86/README
new file mode 100644
index 000000000..fac8785ba
--- /dev/null
+++ b/repos/base-sel4/recipes/src/base-sel4-x86/README
@@ -0,0 +1,7 @@
+This archive contains the seL4-specific part of Genode.
+
+It also contains the source code of the seL4 kernel in the
+'src/kernel/sel4' directory.
+
+Please note that seL4 has a license distinct from Genode. seL4's
+license can be found at 'src/kernel/sel4/LICENSE_GPLv2.txt'.
diff --git a/repos/base-sel4/recipes/src/base-sel4/content.mk b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk
similarity index 94%
rename from repos/base-sel4/recipes/src/base-sel4/content.mk
rename to repos/base-sel4/recipes/src/base-sel4-x86/content.mk
index e5fab522c..d3e349a5a 100644
--- a/repos/base-sel4/recipes/src/base-sel4/content.mk
+++ b/repos/base-sel4/recipes/src/base-sel4-x86/content.mk
@@ -17,7 +17,7 @@ include/spec/%/trace/timestamp.h:
 
 content: README
 README:
-	cp $(REP_DIR)/recipes/src/base-sel4/README $@
+	cp $(REP_DIR)/recipes/src/base-sel4-x86/README $@
 
 content: lib/import etc include/sel4
 lib/import etc include/sel4:
diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/hash b/repos/base-sel4/recipes/src/base-sel4-x86/hash
new file mode 100644
index 000000000..e5ffa4d8d
--- /dev/null
+++ b/repos/base-sel4/recipes/src/base-sel4-x86/hash
@@ -0,0 +1 @@
+2018-12-03 4c549ca539d045300eb65ea716d00a752f436bb1
diff --git a/repos/base-sel4/recipes/src/base-sel4-x86/used_apis b/repos/base-sel4/recipes/src/base-sel4-x86/used_apis
new file mode 100644
index 000000000..df967b96a
--- /dev/null
+++ b/repos/base-sel4/recipes/src/base-sel4-x86/used_apis
@@ -0,0 +1 @@
+base
diff --git a/repos/base-sel4/recipes/src/base-sel4/hash b/repos/base-sel4/recipes/src/base-sel4/hash
deleted file mode 100644
index 9ba8e97fa..000000000
--- a/repos/base-sel4/recipes/src/base-sel4/hash
+++ /dev/null
@@ -1 +0,0 @@
-2018-11-27 d6b7a57753b6bcd38bb4e39232497a4e5d455ee9
diff --git a/tool/run/boot_dir/sel4 b/tool/run/boot_dir/sel4
index aba07ee66..cb85f25af 100644
--- a/tool/run/boot_dir/sel4
+++ b/tool/run/boot_dir/sel4
@@ -147,7 +147,8 @@ proc run_boot_dir {binaries} {
 #
 proc base_src { } {
 
-	if {[have_spec x86]} { return base-sel4 }
+	if {[have_spec x86]}       { return base-sel4-x86 }
+	if {[have_spec wand_quad]} { return base-sel4-wand_quad }
 
 	global specs