diff --git a/recipes/src/rom_fallback/content.mk b/recipes/src/rom_fallback/content.mk
new file mode 100644
index 0000000..047072d
--- /dev/null
+++ b/recipes/src/rom_fallback/content.mk
@@ -0,0 +1,2 @@
+SRC_DIR = src/server/rom_fallback
+include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/recipes/src/rom_fallback/hash b/recipes/src/rom_fallback/hash
new file mode 100644
index 0000000..a39cae5
--- /dev/null
+++ b/recipes/src/rom_fallback/hash
@@ -0,0 +1 @@
+2017-08-28 20b7a65bfac6aed1c94285006623a5f35169e8bb
diff --git a/recipes/src/rom_fallback/used_apis b/recipes/src/rom_fallback/used_apis
new file mode 100644
index 0000000..df967b9
--- /dev/null
+++ b/recipes/src/rom_fallback/used_apis
@@ -0,0 +1 @@
+base
diff --git a/run/rom_fallback.run b/run/rom_fallback.run
index 0f8adeb..103464c 100644
--- a/run/rom_fallback.run
+++ b/run/rom_fallback.run
@@ -4,21 +4,19 @@
 # \date   2016-07-21
 #
 
-
-set build_components {
-	core init
-	drivers/timer
-	server/rom_fallback
-	server/report_rom
-	test/libc
-}
-
-build $build_components
-
 create_boot_directory
 
+import_from_depot \
+	genodelabs/src/[base_src] \
+	genodelabs/src/init \
+	genodelabs/src/report_rom \
+	genodelabs/src/rom_fallback \
+
+build { server/rom_fallback test/libc }
+
 append config {
 <config verbose="yes">
+	<default caps="256"/>
 	<parent-provides>
 		<service name="CPU"/>
 		<service name="LOG"/>
@@ -61,8 +59,8 @@ append config {
 	</start>
 
 	<start name="test-libc">
-		<resource name="RAM" quantum="8M"/>
-		<config>
+		<resource name="RAM" quantum="4M"/>
+		<config ld_verbose="yes">
 			<libc stdout="/log" stderr="log"/>
 			<vfs> <log/> </vfs>
 		</config>
@@ -73,18 +71,16 @@ append config {
 
 install_config $config
 
-# generic modules
 set boot_modules {
-	core init ld.lib.so
-	libc.lib.so libm.lib.so posix.lib.so
-	report_rom
 	rom_fallback
+	libc.lib.so
+	libm.lib.so
+	posix.lib.so
 	test-libc
-	timer
 }
 
 build_boot_image $boot_modules
 
 append qemu_args " -nographic"
 
-run_genode_until {child "test-libc" exited with exit value 0} 60
+run_genode_until {--- libC test ---} 60
diff --git a/src/server/rom_fallback/component.cc b/src/server/rom_fallback/component.cc
index f01720a..4a76d18 100644
--- a/src/server/rom_fallback/component.cc
+++ b/src/server/rom_fallback/component.cc
@@ -11,6 +11,8 @@
  * under the terms of the GNU General Public License version 2.
  */
 
+/* TODO: ambiguated services */
+
 /* Genode includes */
 #include <base/attached_rom_dataspace.h>
 #include <rom_session/capability.h>