diff --git a/README.md b/README.md
index ab7ada2e16..4eb5b7f126 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 branch | target | description | how to build | download
 -------|--------|-------------|------------- |---------
 [master](https://github.com/deadw00d/AROS/tree/master) | linux-x86_64 | Stable and always backwards compatible hosted version | [Core](https://github.com/deadw00d/AROS/blob/master/INSTALL.md) | [Core](https://vps691225.ovh.net/download/builds/AROS/)
+[master](https://github.com/deadw00d/AROS/tree/master) | amiga-m68k | Amiga replacement ROM and system software | [Core](https://github.com/deadw00d/AROS/blob/master/INSTALL.md) | [Core](https://vps691225.ovh.net/download/builds/AROS/)
 
 ### Backwards compatibility
 
@@ -21,7 +22,6 @@ branch | target | description | how to build | download
 -------|--------|-------------|--------------|---------
 [alt-runtime](https://github.com/deadw00d/AROS/tree/alt-runtime) | runtimelinux-x86_64 | AxRuntime for Linux x86_64 | [AxRuntime](https://github.com/deadw00d/AROS/blob/alt-runtime/INSTALL.md) | [AxRuntime](https://vps691225.ovh.net/download/builds/AxRuntime/)
 [alt-abiv0](https://github.com/deadw00d/AROS/tree/alt-abiv0) | pc-i386 | ABI_V0 version of native 32-bit AROS | [ABIv0](https://github.com/deadw00d/AROS/blob/alt-abiv0/INSTALL.md) | [ABIv0](https://vps691225.ovh.net/download/builds/AROS-ABIV0/)
-[alt-bincompat](https://github.com/deadw00d/AROS/tree/alt-bincompat) | amiga-m68k | Amiga replacement ROM and system software | [Amiga](https://github.com/deadw00d/AROS/blob/alt-bincompat/INSTALL.md) | [Amiga](https://vps691225.ovh.net/download/builds/AROS/)
 
 ## Relation between Core and Alternatives
 
diff --git a/scripts/rebuild-conf b/scripts/rebuild-conf
index ffdc0fc8d2..fdaaec595c 100755
--- a/scripts/rebuild-conf
+++ b/scripts/rebuild-conf
@@ -4,6 +4,8 @@ show_selection ()
     printf "    2)  core-linux-x86_64 (DEBUG)\n"
     printf "    3)  core-pc-x86_64\n"
     printf "    4)  core-contrib-x86_64\n"
+    printf "    10) toolchain-core-m68k\n"
+    printf "    11) core-amiga-m68k\n"
 }
 
 process_selection ()
@@ -38,6 +40,19 @@ process_selection ()
         MAKE_TARGET_2="mmake"
         MAKE_TARGET_3="contrib"
         ;;
+        10)
+        TOOLCHAIN_DIR=$(pwd)/toolchain-core-m68k
+        BUILD_DIR=$(pwd)/toolchain-core-m68k-build
+        TOOLCHAIN_BUILD=yes
+        CONFIGURE_TARGET=amiga-m68k
+        MAKE_TARGET="-s crosstools"
+        ;;
+        11)
+        TOOLCHAIN_DIR=$(pwd)/toolchain-core-m68k
+        BUILD_DIR=$(pwd)/core-amiga-m68k
+        CONFIGURE_TARGET=amiga-m68k
+        CONFIGURE_OPTS="--with-aros-toolchain=yes"
+        ;;
     esac
 }