diff --git a/libretro/cores/dosbox-svn/Tuprules.tup b/libretro/cores/dosbox-svn/Tuprules.tup
index 1b03b3247..dbfad9568 100644
--- a/libretro/cores/dosbox-svn/Tuprules.tup
+++ b/libretro/cores/dosbox-svn/Tuprules.tup
@@ -15,7 +15,7 @@ endif
 WITH_FAKE_SDL = 1
 include upstream/libretro/Makefile.common
 
-DEFINES += -O2 -DNDEBUG -D__GENODE__ -DWITH_FAKE_SDL
+DEFINES += -O1 -DNDEBUG -D__GENODE__ -DWITH_FAKE_SDL
 DEFINES += -DDB_HAVE_CLOCK_GETTIME
 DEFINES += $(COMMONFLAGS)
 
diff --git a/libretro/cores/dosbox-svn/runtime b/libretro/cores/dosbox-svn/runtime
index be764bce1..c42e71fa3 100644
--- a/libretro/cores/dosbox-svn/runtime
+++ b/libretro/cores/dosbox-svn/runtime
@@ -17,7 +17,7 @@
 		<rom label="vfs.lib.so"/>
 	</content>
 
-	<config ld_verbose="yes">
+	<config>
 		<game path="/fs/dosbox.conf"/>
 		<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
 		<vfs>
diff --git a/libretro/topbench/Tupfile b/libretro/topbench/Tupfile
new file mode 100644
index 000000000..4d8b60886
--- /dev/null
+++ b/libretro/topbench/Tupfile
@@ -0,0 +1,16 @@
+ifndef CONFIG_NO_NETWORK
+
+TARGET_NAME = topbench
+include_rules
+
+: |> wget --quiet https://github.com/MobyGamer/TOPBENCH/releases/download/0.38.h/%o |> TOPBV38H.ZIP {zip}
+
+: {zip} \
+	|> unzip -L %f -d tmp ; tar cf %o -C tmp . ; rm -r tmp \
+	|> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/TOPBV38H.tar {tar}
+
+RAW_VERSION = 0.38.h
+: {tar} |> !collect_raw |>
+: |> !raw |>
+
+endif
diff --git a/runtimes/topbench/runtime b/libretro/topbench/runtime
similarity index 95%
rename from runtimes/topbench/runtime
rename to libretro/topbench/runtime
index 092a651f1..4934ae952 100644
--- a/runtimes/topbench/runtime
+++ b/libretro/topbench/runtime
@@ -3,6 +3,7 @@
 	<requires>
 		<file_system/>
 		<nitpicker/>
+		<report/>
 		<rtc/>
 	</requires>
 
@@ -16,7 +17,7 @@
 		<rom label="vfs.lib.so"/>
 	</content>
 
-	<config>
+	<config ld_verbose="yes">
 		<game path="/dosbox.conf"/>
 		<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc"/>
 		<vfs>
diff --git a/runtimes/topbench/Tupfile b/runtimes/topbench/Tupfile
deleted file mode 100644
index c94ea172c..000000000
--- a/runtimes/topbench/Tupfile
+++ /dev/null
@@ -1,27 +0,0 @@
-ifndef CONFIG_NO_NETWORK
-
-TARGET_NAME = topbench
-
-PKG_DEPENDS += \
-	@(SDK_USER)/src/vfs/@(SDK_VERSION) \
-	@(SDK_USER)/src/libc/@(SDK_VERSION) \
-	@(SDK_USER)/src/stdcxx/@(SDK_VERSION) \
-	_/src/dosbox-libretro \
-	_/src/retro_frontend \
-	_/raw/topbench \
-
-include_rules
-
-: |> wget --quiet https://github.com/MobyGamer/TOPBENCH/releases/download/0.38.h/%o |> TOPBV38H.ZIP {zip}
-
-: {zip} \
-	|> unzip -L %f -d tmp ; tar cf %o -C tmp . ; rm -r tmp \
-	|> $(DEPOT_RAW_DIR)/%d/@(DEPOT_VERSION)/TOPBV38H.tar {raw}
-
-: {zip} |> !collect_raw |>
-: |> !raw |>
-
-: runtime |> !collect_pkg_runtime |>
-: |> !pkg |>
-
-endif