diff --git a/Android.mk b/Android.mk
index 2a37721d4..b8ca52504 100644
--- a/Android.mk
+++ b/Android.mk
@@ -97,7 +97,7 @@ LOCAL_SRC_FILES := \
   ))
 
 LOCAL_CXXFLAGS := -std=c++11
-LOCAL_SHARED_LIBRARIES := libopenal libmpg123 
+LOCAL_SHARED_LIBRARIES := libopenal
 LOCAL_STATIC_LIBRARIES := libvorbis libogg libtheora libmodplug libfreetype libluajit SDL2_static
 
 # $(info liblove: include dirs $(LOCAL_C_INCLUDES))
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b23a1835a..8a8a1b101 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,6 @@ else()
 endif()
 
 option(LOVE_JIT "Use LuaJIT" TRUE)
-option(LOVE_MPG123 "Use mpg123" TRUE)
 
 if(LOVE_JIT)
 	if(APPLE)
@@ -60,10 +59,6 @@ else()
 	message(STATUS "LuaJIT: Disabled")
 endif()
 
-if(NOT LOVE_MPG123)
-	add_definitions(-DLOVE_NOMPG123)
-endif()
-
 message(STATUS "Target platform: ${LOVE_TARGET_PLATFORM}")
 
 if(POLICY CMP0072)
@@ -118,17 +113,6 @@ if(MEGA)
 		${MEGA_OPENAL}
 	)
 
-	if(LOVE_MPG123)
-		set(LOVE_LINK_LIBRARIES
-			${LOVE_LINK_LIBRARIES}
-			${MEGA_MPEG123}
-		)
-		set(LOVE_MOVE_DLLS
-			${LOVE_MOVE_DLLS}
-			${MEGA_MPEG123}
-		)
-	endif()
-
 	if(LOVE_JIT)
 		set(LOVE_LUA_LIBRARY ${MEGA_LUAJIT_LIB})
 		# LOVE_EXTRA_DLLS are non-runtime DLLs which should be bundled with the
@@ -209,18 +193,6 @@ Please see http://bitbucket.org/rude/megasource
 		${ZLIB_LIBRARY}
 	)
 
-	if(LOVE_MPG123)
-		find_package(MPG123 REQUIRED)
-		set(LOVE_LINK_LIBRARIES
-			${LOVE_LINK_LIBRARIES}
-			${MPG123_LIBRARY}
-		)
-		set(LOVE_INCLUDE_DIRS
-			${LOVE_INCLUDE_DIRS}
-			${MPG123_INCLUDE_DIR}
-		)
-	endif()
-
 	if(LOVE_JIT)
 		find_package(LuaJIT REQUIRED)
 		set(LOVE_LUA_LIBRARY ${LUAJIT_LIBRARY})
@@ -921,6 +893,8 @@ set(LOVE_SRC_MODULE_SOUND_LULLABY
 	src/modules/sound/lullaby/GmeDecoder.h
 	src/modules/sound/lullaby/ModPlugDecoder.cpp
 	src/modules/sound/lullaby/ModPlugDecoder.h
+	src/modules/sound/lullaby/MP3Decoder.h
+	src/modules/sound/lullaby/MP3Decoder.cpp
 	src/modules/sound/lullaby/Sound.cpp
 	src/modules/sound/lullaby/Sound.h
 	src/modules/sound/lullaby/VorbisDecoder.cpp
@@ -929,14 +903,6 @@ set(LOVE_SRC_MODULE_SOUND_LULLABY
 	src/modules/sound/lullaby/WaveDecoder.h
 )
 
-if(LOVE_MPG123)
-	set(LOVE_SRC_MODULE_SOUND_LULLABY
-		${LOVE_SRC_MODULE_SOUND_LULLABY}
-		src/modules/sound/lullaby/Mpg123Decoder.cpp
-		src/modules/sound/lullaby/Mpg123Decoder.h
-	)
-endif()
-
 set(LOVE_SRC_MODULE_SOUND
 	${LOVE_SRC_MODULE_SOUND_ROOT}
 	${LOVE_SRC_MODULE_SOUND_LULLABY}
@@ -1252,11 +1218,21 @@ add_library(love_3p_ddsparse ${LOVE_SRC_3P_DDSPARSE})
 #
 
 set(LOVE_SRC_3P_DRFLAC
-	src/libraries/dr_flac/dr_flac.h
+	src/libraries/dr/dr_flac.h
 )
 
 # dr_flac has no implementation files of its own.
 
+#
+# dr_mp3
+#
+
+set(LOVE_SRC_3P_DRMP3
+	src/libraries/dr/dr_mp3.h
+)
+
+# dr_mp3 has no implementation files of its own.
+
 #
 # enet
 #
diff --git a/platform/unix/configure.ac b/platform/unix/configure.ac
index b682fc03c..197efeea0 100644
--- a/platform/unix/configure.ac
+++ b/platform/unix/configure.ac
@@ -55,7 +55,6 @@ with_clean_luaversion=`printf ${with_luaversion} | sed 's/\.//g'`
 m4_include([configure-modules-pre.ac])
 
 # Other features that can be enabled/disabled
-AC_ARG_ENABLE([mpg123], AC_HELP_STRING([--disable-mpg123], [Disable mp3 support, for patent-free builds]), [], [enable_mpg123=yes])
 AC_ARG_ENABLE([gme], AC_HELP_STRING([--enable-gme], [Enable GME support, for more chiptuney goodness]), [], [enable_gme=no])
 
 # Dependencies we always use
@@ -71,12 +70,9 @@ AS_VAR_IF([enable_module_font], [yes], [ACLOVE_DEP_FREETYPE2], [])
 AS_VAR_IF([enable_module_sound], [yes], [
 	ACLOVE_DEP_LIBMODPLUG
 	ACLOVE_DEP_VORBISFILE
-], [enable_mpg123=no])
+], [])
 AS_VAR_IF([enable_module_video], [yes], [ACLOVE_DEP_THEORA], [])
 AS_VAR_IF([enable_gme], [yes], [ACLOVE_DEP_GME], [])
-AS_VAR_IF([enable_mpg123], [no],
-	  AC_DEFINE([LOVE_NOMPG123], [], [Build without mpg123]),
-	  [ACLOVE_DEP_MPG123])
 
 # Add flags for optional libraries
 AC_ARG_ENABLE([library-enet], [  --disable-library-enet    Turn off library enet], [], [enable_library_enet=yes])
@@ -117,7 +113,6 @@ AS_VAR_IF([enable_exe], [no], [], #else
 	  AC_DEFINE([LOVE_BUILD_EXE], [], [Skip building launcher]))
 
 AM_CONDITIONAL([LOVE_BUILD_EXE], [test "x$enable_exe" != xno])
-AM_CONDITIONAL([LOVE_NOMPG123], [test "x$enable_mpg123" = xno])
 AM_CONDITIONAL([LOVE_TARGET_OSX], [test "x$enable_osx" != xno])
 
 # Automatic script file rebuilding
diff --git a/platform/unix/debian/control.in b/platform/unix/debian/control.in
index 1f65c293e..e2dc757fc 100644
--- a/platform/unix/debian/control.in
+++ b/platform/unix/debian/control.in
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 9),
                luajit,
                libluajit-5.1-dev,
                libmodplug-dev,
-               libmpg123-dev,
                libopenal-dev,
                libphysfs-dev,
                libsdl2-dev (>= 2.0.1),
diff --git a/platform/unix/exclude b/platform/unix/exclude
index 872f11f2b..95b2573eb 100644
--- a/platform/unix/exclude
+++ b/platform/unix/exclude
@@ -1,5 +1,3 @@
 \./libraries/luasocket/libluasocket/wsocket.*
 \./love\.cpp
-\./modules/sound/lullaby/Mpg123Decoder\.cpp
-\./modules/sound/lullaby/Mpg123Decoder\.h
 \./libraries/glslang/glslang/OSDependent/Windows
diff --git a/platform/unix/genmodules b/platform/unix/genmodules
index b757554b7..61c81292c 100644
--- a/platform/unix/genmodules
+++ b/platform/unix/genmodules
@@ -45,14 +45,6 @@ genmodules()
 			printf "${FILES:0:${#FILES}-2}\n\n"
 			modulelist+=("$module")
 		fi
-
-		if [[ "$module" = "sound" ]]; then
-			printf "if !LOVE_NOMPG123\n"
-			printf "liblove_module_$module += \\\\\n"
-			printf "\t./modules/sound/lullaby/Mpg123Decoder.cpp \\\\\n"
-			printf "\t./modules/sound/lullaby/Mpg123Decoder.h\n"
-			printf "endif\n\n"
-		fi
 	done
 
 	cd ../libraries