diff --git a/Makefile b/Makefile
index edae366d1e..d2019f2475 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ rsdl2_SRCS := $(shell find OpenRA.Renderer.Sdl2/ -iname '*.cs')
 rsdl2_TARGET = OpenRA.Renderer.Sdl2.dll
 rsdl2_KIND = library
 rsdl2_DEPS = $(fileformats_TARGET) $(game_TARGET) $(rsdl_TARGET) $(rgl_TARGET)
-rsdl2_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll thirdparty/SDL2\#.dll $(rsdl2_DEPS)
+rsdl2_LIBS = $(COMMON_LIBS) thirdparty/Tao/Tao.OpenGl.dll thirdparty/SDL2-CS.dll $(rsdl2_DEPS)
 
 rnull_SRCS := $(shell find OpenRA.Renderer.Null/ -iname '*.cs')
 rnull_TARGET = OpenRA.Renderer.Null.dll
diff --git a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj
index 7c5036b38e..711ae05120 100644
--- a/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj
+++ b/OpenRA.Renderer.Sdl2/OpenRA.Renderer.Sdl2.csproj
@@ -37,8 +37,8 @@
       <HintPath>..\thirdparty\Tao\Tao.OpenGl.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="SDL2#">
-      <HintPath>..\thirdparty\SDL2#.dll</HintPath>
+    <Reference Include="SDL2-CS">
+      <HintPath>..\thirdparty\SDL2-CS.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh
index ded6a6f695..95d9db5776 100755
--- a/packaging/osx/buildpackage.sh
+++ b/packaging/osx/buildpackage.sh
@@ -28,8 +28,8 @@ rm OpenRA.app/Contents/Resources/Tao.Sdl.*
 rm OpenRA.app/Contents/Resources/Tao.Cg.*
 
 # Change the .config to use the packaged SDL
-sed "s/\/Library\/Frameworks\/SDL2.framework/./" OpenRA.app/Contents/Resources/SDL2\#.dll.config > temp
-mv temp OpenRA.app/Contents/Resources/SDL2\#.dll.config
+sed "s/\/Library\/Frameworks\/SDL2.framework/./" OpenRA.app/Contents/Resources/SDL2-CS.dll.config > temp
+mv temp OpenRA.app/Contents/Resources/SDL2-CS.dll.config
 rm temp
 
 # Package app bundle into a zip and clean up
diff --git a/packaging/osx/template.app/Contents/Resources/SDL2 b/packaging/osx/template.app/Contents/Resources/SDL2
index ec107755d0..6ca591905a 100755
Binary files a/packaging/osx/template.app/Contents/Resources/SDL2 and b/packaging/osx/template.app/Contents/Resources/SDL2 differ
diff --git a/packaging/package-all.sh b/packaging/package-all.sh
index 37461a526d..a6c7d500fa 100755
--- a/packaging/package-all.sh
+++ b/packaging/package-all.sh
@@ -51,8 +51,8 @@ cp thirdparty/FuzzyLogicLibrary.dll packaging/built
 # SharpFont for FreeType support
 cp thirdparty/SharpFont* packaging/built
 
-# SDL2#
-cp thirdparty/SDL2\#* packaging/built
+# SDL2-CS
+cp thirdparty/SDL2-CS packaging/built
 
 # Mono.NAT for UPnP support
 cp thirdparty/Mono.Nat.dll packaging/built
diff --git a/thirdparty/SDL2#.dll b/thirdparty/SDL2#.dll
deleted file mode 100755
index 9b74e5df23..0000000000
Binary files a/thirdparty/SDL2#.dll and /dev/null differ
diff --git a/thirdparty/SDL2-CS.dll b/thirdparty/SDL2-CS.dll
new file mode 100755
index 0000000000..f0862452d7
Binary files /dev/null and b/thirdparty/SDL2-CS.dll differ
diff --git a/thirdparty/SDL2#.dll.config b/thirdparty/SDL2-CS.dll.config
similarity index 82%
rename from thirdparty/SDL2#.dll.config
rename to thirdparty/SDL2-CS.dll.config
index 64e9166b4c..0d5a2782fa 100644
--- a/thirdparty/SDL2#.dll.config
+++ b/thirdparty/SDL2-CS.dll.config
@@ -16,7 +16,7 @@
 	<dllmap dll="SDL2_ttf.dll" os="osx" target="libSDL2_ttf-2.0.0.dylib"/>
 	<dllmap dll="SDL2_ttf.dll" os="linux" target="libSDL2_ttf-2.0.so.0"/>
 
-	<dllmap dll="openal32.dll" os="windows" target="openal32.dll"/>
-	<dllmap dll="openal32.dll" os="osx" target="libopenal.1.dylib"/>
-	<dllmap dll="openal32.dll" os="linux" target="libopenal.so.1"/>
+	<dllmap dll="soft_oal.dll" os="windows" target="soft_oal.dll"/>
+	<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib"/>
+	<dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
 </configuration>