diff --git a/media-libs/openmpt/libopenmpt-0.4.4.recipe b/media-libs/openmpt/libopenmpt-0.4.4.recipe
new file mode 100644
index 000000000..59c4e8845
--- /dev/null
+++ b/media-libs/openmpt/libopenmpt-0.4.4.recipe
@@ -0,0 +1,102 @@
+SUMMARY="Audio module tracker formerly known as ModPlug Tracker"
+DESCRIPTION="libopenmpt is a cross-platform C++ and C module playback \
+library. It is based on the player code of the Open ModPlug Tracker project. \
+It offers high-quality module playback on a variety of platforms."
+HOMEPAGE="https://openmpt.org/"
+COPYRIGHT="2004-2019 OpenMPT contributors
+	1997-2003 Olivier Lapicque"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-$portVersion+release.autotools.tar.gz"
+CHECKSUM_SHA256="57834bd4e67485019584e19a1080615269c1e92551230a7c96e79c4fc97b0f75"
+SOURCE_DIR="libopenmpt-$portVersion+release.autotools"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 x86"
+
+libmodplugVersion=1.0.0
+libopenmpt_modplugVersion=1.0.0
+libopenmptVersion=0.1.1
+libmodplugVersionCompat="$libmodplugVersion compat >= ${libmodplugVersion%%.*}"
+libopenmpt_modplugVersionCompat="$libopenmpt_modplugVersion compat >= ${libopenmpt_modplugVersion%%.*}"
+libopenmptVersionCompat="$libopenmptVersion compat >= ${libopenmptVersion%%.*}"
+
+PROVIDES="
+	libopenmpt$secondaryArchSuffix = $portVersion
+	lib:libmodplug$secondaryArchSuffix = $libmodplugVersionCompat
+	lib:libopenmpt_modplug$secondaryArchSuffix = $libopenmpt_modplugVersionCompat
+	lib:libopenmpt$secondaryArchSuffix = $libopenmptVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+REPLACES="
+	libmodplug$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libopenmpt${secondaryArchSuffix}_devel = $portVersion
+	devel:libmodplug$secondaryArchSuffix = $libmodplugVersionCompat
+	devel:libopenmpt_modplug$secondaryArchSuffix = $libopenmpt_modplugVersionCompat
+	devel:libopenmpt$secondaryArchSuffix = $libopenmptVersionCompat
+	"
+REQUIRES_devel="
+	libopenmpt$secondaryArchSuffix == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage libopenmpt$secondaryArchSuffix \
+	$libDir/libmodplug.so.$libmodplugVersion \
+	$libDir/libopenmpt_modplug.so.$libopenmpt_modplugVersion \
+	$libDir/libopenmpt.so.$libopenmptVersion
+
+BUILD()
+{
+	# Build a minimal LIB for FFMPEG
+	runConfigure ./configure \
+		--disable-openmpt123 \
+		--disable-examples \
+		--enable-libopenmpt_modplug \
+		--enable-libmodplug \
+		--without-mpg123 \
+		--without-ogg \
+		--without-vorbis \
+		--without-vorbisfile \
+		--with-pulseaudio \
+		--without-portaudio \
+		--without-portaudiocpp \
+		--without-sndfile \
+		--without-flac
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libmodplug libopenmpt_modplug libopenmpt
+	rm $developLibDir/*.la
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}
diff --git a/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe b/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe
deleted file mode 100644
index abe95a337..000000000
--- a/media-sound/libopenmpt/libopenmpt-0.2.7386~beta20.3.recipe
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY="OpenMPT based module player library and command-line player"
-DESCRIPTION="libopenmpt is a cross platform C++ and C libary to decode tracked \
-music files (modules) int a raw PCM audio stream. openmpt123 is a \
-cross-platform command line or terminal based module file player."
-HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
-COPYRIGHT="2004-2016 OpenMPT contributors"
-LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${portVersion/\~/-}-autotools.tar.gz"
-CHECKSUM_SHA256="a6a7e6da1ae66e1cf46985ee92c182e50652d71b96135e9fa6048e132d844753"
-SOURCE_DIR="libopenmpt-${portVersion%~*}-autotools"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	libopenmpt$secondaryArchSuffix = $portVersion
-	lib:libopenmpt$secondaryArchSuffix = 0.0.20 compat >= 0
-	cmd:openmpt123$commandSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libFLAC$secondaryArchSuffix
-	lib:libltdl$secondaryArchSuffix
-	lib:libmpg123$secondaryArchSuffix
-	lib:libogg$secondaryArchSuffix
-	lib:libsndfile$secondaryArchSuffix
-	lib:libvorbis$secondaryArchSuffix
-	lib:libvorbisfile$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libopenmpt${secondaryArchSuffix}_devel
-	devel:libopenmpt$secondaryArchSuffix = 0.0.20 compat >= 0
-	"
-REQUIRES_devel="
-	libopenmpt$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libFLAC$secondaryArchSuffix
-	devel:libltdl$secondaryArchSuffix
-	devel:libmpg123$secondaryArchSuffix
-	devel:libogg$secondaryArchSuffix
-	devel:libsndfile$secondaryArchSuffix
-	devel:libvorbis$secondaryArchSuffix
-	devel:libvorbisfile$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	# portaudio and portaudiocpp disabled as they are untested on all arches
-	runConfigure --omit-dirs binDir ./configure \
-		--bindir=$commandBinDir \
-		--without-pulseaudio \
-		--without-portaudio \
-		--without-portaudiocpp \
-		--disable-doxygen-doc
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-	rm $libDir/libopenmpt.la
-
-	prepareInstalledDevelLib libopenmpt
-	fixPkgconfig
-
-	packageEntries devel $developDir
-}
-
-TEST()
-{
-	make check
-}