diff --git a/index.xml b/index.xml
index 2ee8631..032c8b4 100644
--- a/index.xml
+++ b/index.xml
@@ -12,7 +12,6 @@
 			<pkg path="_/pkg/240pSuite-SNES" info="SNES tests"/>
 			<pkg path="_/pkg/advanced_tests" info="An advanced test core written in C"/>
 			<pkg path="_/pkg/button_test" info="Libretro joypad button test"/>
-			<pkg path="_/pkg/simple_tests" info="A test core written in C"/>
 			<pkg path="_/pkg/topbench_dosbox-libretro" info="The Oldskool PC Benchmark running in DOSBox"/>
 			<pkg path="_/pkg/topbench_dosbox-svn" info="The Oldskool PC Benchmark running in DOSBox"/>
 		</index>
@@ -42,6 +41,7 @@
 		<pkg path="_/pkg/seoul-nova" info="Seoul VMM with routable block devices"/>
 		<index name="Installers">
 			<pkg path="_/pkg/fetch_alpine_x86_64" info="Fetch Alpine Linux virt ISO"/>
+			<pkg path="_/pkg/fetch_freebsd_12_amd64" info="Fetch FreeBSD 12 mini-memstick"/>
 			<pkg path="_/pkg/fetch_nixos_x86_64" info="Fetch NixOS minimal ISO"/>
 			<pkg path="_/pkg/fetch_ubuntu_x86_64" info="Fetch Ubuntu netboot installer ISO"/>
 		</index>
diff --git a/vm/fetchers/freebsd_12_amd64/Tupfile b/vm/fetchers/freebsd_12_amd64/Tupfile
new file mode 100644
index 0000000..acc98a1
--- /dev/null
+++ b/vm/fetchers/freebsd_12_amd64/Tupfile
@@ -0,0 +1,4 @@
+TARGET_NAME = fetch_freebsd_12_amd64
+URL = https://download.freebsd.org/ftp/releases/amd64/amd64/ISO-IMAGES/12.0/FreeBSD-12.0-RELEASE-amd64-mini-memstick.img
+SHA256 = 7ee8277fa3e0cf64e3038445fd507b58bfd615b61fec4ff446085f1703000347
+include_rules
diff --git a/vm/openbsd/install/Tupfile b/vm/openbsd/install/Tupfile
index 5d63178..f8f7a3d 100644
--- a/vm/openbsd/install/Tupfile
+++ b/vm/openbsd/install/Tupfile
@@ -1,3 +1,5 @@
+ifdef YES_REALLY_DO_IT
+
 TARGET_NAME = openbsd_install
 IMAGE_TYPE = install
 RAW_NAME = openbsd-$(IMAGE_TYPE)-i386
@@ -24,3 +26,5 @@ URL_BASE = https://cdn.openbsd.org/pub/OpenBSD/$(RAW_VERSION)/i386
 |> $(RAW_DIR)/$(IMAGE_NAME)
 
 include $(RAW_RULES)
+
+endif