diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23ee264ae..e835c90a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,8 +12,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 endif()
 
 if(NOT CMAKE_BUILD_TYPE MATCHES "Debug|Devel|MinSizeRel|RelWithDebInfo|Release")
-  message(STATUS "CMAKE_BUILD_TYPE not set, defaulting to Release.")
-  set(CMAKE_BUILD_TYPE "Release")
+  message(FATAL_ERROR "CMAKE_BUILD_TYPE not set. Please set it first.")
 endif()
 
 # Pull in modules.
diff --git a/scripts/packaging/appimage/make-appimage.sh b/scripts/packaging/appimage/make-appimage.sh
index 3d85c3b36..50226ad9a 100755
--- a/scripts/packaging/appimage/make-appimage.sh
+++ b/scripts/packaging/appimage/make-appimage.sh
@@ -81,7 +81,7 @@ if [ ! -f "$LINUXDEPLOY_PLUGIN_QT" ]; then
 fi
 
 if [ ! -f "$APPIMAGETOOL" ]; then
-	retry_command wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+	retry_command wget -O "$APPIMAGETOOL" https://github.com/stenzek/duckstation-ext-qt-minimal/releases/download/linux/appimagetool-x86_64.AppImage
 	chmod +x "$APPIMAGETOOL"
 fi
 
diff --git a/scripts/packaging/appimage/make-cross-appimage.sh b/scripts/packaging/appimage/make-cross-appimage.sh
index 9b3864062..3d7489902 100755
--- a/scripts/packaging/appimage/make-cross-appimage.sh
+++ b/scripts/packaging/appimage/make-cross-appimage.sh
@@ -227,7 +227,7 @@ APPIMAGERUNTIME=./runtime-${RUNTIMEARCH}
 PATCHELF=patchelf
 
 if [ ! -f "$APPIMAGETOOL" ]; then
-	retry_command wget -O "$APPIMAGETOOL" https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+	retry_command wget -O "$APPIMAGETOOL" https://github.com/stenzek/duckstation-ext-qt-minimal/releases/download/linux/appimagetool-x86_64.AppImage
 	chmod +x "$APPIMAGETOOL"
 fi