diff --git a/all b/all
index 78c63fc..207f645 100755
--- a/all
+++ b/all
@@ -912,7 +912,7 @@ case "$cmd" in
 					TARGETS="sv-$debug sdl-$debug"
 					;;
 			esac
-			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+			export CC="$CC -fno-reorder-blocks -I$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 		else
 			TARGETS="sv-$debug cl-$debug sdl-$debug"
 		fi
@@ -1053,8 +1053,8 @@ case "$cmd" in
 			client=
 			export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"
-			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
+			export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"
 			client=-sdl
 		else
 			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"
@@ -1672,11 +1672,7 @@ case "$cmd" in
 		verbose "$SELF" release-compile osx \
 			'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
-			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
-		verbose "$SELF" release-compile osx \
-			'STRIP=: CC="gcc -g1 -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \
-			'' '' \
-			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+			'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
 		;;
 	release-engine-linux32)
 		verbose "$SELF" release-compile linux32 \
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist
deleted file mode 100644
index 4657eb9..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Info.plist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>xonotic-osx-sdl</string>
-	<key>CFBundleIconFile</key>
-	<string>Xonotic</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.4.0</string>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6.0</string>
-	</dict>
-</dict>
-</plist>
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib
deleted file mode 100755
index 5aa3108..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_blind_id.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib
deleted file mode 100755
index 0eb3527..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libd0_rijndael.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib
deleted file mode 100644
index 2120546..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.6.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.dylib
deleted file mode 120000
index c1597ad..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libfreetype.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libfreetype.6.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib
deleted file mode 100755
index c9377fc..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libjpeg.62.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib
deleted file mode 100755
index 4987925..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.1.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.dylib
deleted file mode 120000
index 2848679..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libmodplug.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libmodplug.1.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.dylib
deleted file mode 100755
index 29b7951..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.dylib
deleted file mode 120000
index 1fb90f0..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libogg.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libogg.0.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib
deleted file mode 100755
index db3c57f..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libpng14.14.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.dylib
deleted file mode 100755
index 9c3f4da..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.dylib
deleted file mode 120000
index dede91c..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libtheora.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libtheora.0.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.dylib
deleted file mode 100755
index f85ffbe..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.0.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.dylib
deleted file mode 120000
index 33a5cc7..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbis.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libvorbis.0.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.dylib
deleted file mode 100755
index 8a34559..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.2.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.dylib
deleted file mode 120000
index fa8785b..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisenc.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisenc.2.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.dylib
deleted file mode 100755
index 310d982..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.3.dylib and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.dylib b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.dylib
deleted file mode 120000
index f8785e8..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/libvorbisfile.dylib
+++ /dev/null
@@ -1 +0,0 @@
-libvorbisfile.3.dylib
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/PkgInfo b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/PkgInfo
deleted file mode 100644
index bd04210..0000000
--- a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/English.lproj/InfoPlist.strings b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/English.lproj/InfoPlist.strings
deleted file mode 100755
index 6fe642d..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns b/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns
deleted file mode 100644
index 7fda030..0000000
Binary files a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Resources/Xonotic.icns and /dev/null differ
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Headers
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Resources b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Resources
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Resources
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Resources
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/SDL b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/SDL
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/SDL
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/SDL
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_name.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_name.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_name.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_name.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/close_code.h b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/SDLMain.nib/objects.nib b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/SDLMain.nib/objects.nib
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/SDLMain.nib/objects.nib
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/Resources/SDLMain.nib/objects.nib
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/A/SDL
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/Current b/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/Current
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Versions/Current
rename to misc/buildfiles/osx/Xonotic.app/Contents/Frameworks/SDL.framework/Versions/Current
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
index 316a314..4657eb9 100644
--- a/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
+++ b/misc/buildfiles/osx/Xonotic.app/Contents/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>xonotic-osx-agl</string>
+	<string>xonotic-osx-sdl</string>
 	<key>CFBundleIconFile</key>
 	<string>Xonotic</string>
 	<key>CFBundlePackageType</key>
@@ -16,5 +16,10 @@
 	<string>1.0</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.0</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+	</dict>
 </dict>
 </plist>
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl
deleted file mode 100755
index baa8828..0000000
--- a/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-agl
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-export DYLD_LIBRARY_PATH="${0%/*}"
-	# same dir as the executable
-
-set -- "$0"-bin "$@" -notexturenonpoweroftwo
-
-exec "$@"
diff --git a/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl b/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl
similarity index 100%
rename from misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl
rename to misc/buildfiles/osx/Xonotic.app/Contents/MacOS/xonotic-osx-sdl
diff --git a/misc/buildfiles/osx/Xonotic.app/Contents/Resources/English.lproj/InfoPlist.strings b/misc/buildfiles/osx/Xonotic.app/Contents/Resources/English.lproj/InfoPlist.strings
index c5b65b3..6fe642d 100755
Binary files a/misc/buildfiles/osx/Xonotic.app/Contents/Resources/English.lproj/InfoPlist.strings and b/misc/buildfiles/osx/Xonotic.app/Contents/Resources/English.lproj/InfoPlist.strings differ