diff --git a/srcpkgs/lmms/patches/sndio.patch b/srcpkgs/lmms/patches/sndio.patch
new file mode 100644
index 00000000000..ed15d535c3d
--- /dev/null
+++ b/srcpkgs/lmms/patches/sndio.patch
@@ -0,0 +1,28 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -57,6 +57,7 @@
+ OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
+ OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
+ OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)
++OPTION(WANT_SNDIO	"Include sndio support" ON)
+ OPTION(WANT_SOUNDIO	"Include libsoundio support" ON)
+ OPTION(WANT_SDL		"Include SDL (Simple DirectMedia Layer) support" ON)
+ OPTION(WANT_SF2		"Include SoundFont2 player plugin" ON)
+@@ -429,7 +430,7 @@
+ 	FIND_PACKAGE(Threads)
+ ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE OR LMMS_BUILD_OPENBSD)
+ 
+-IF(LMMS_BUILD_OPENBSD)
++IF(WANT_SNDIO)
+ 	FIND_PACKAGE(Sndio)
+ 	IF(SNDIO_FOUND)
+ 		SET(LMMS_HAVE_SNDIO TRUE)
+@@ -437,7 +438,7 @@
+     	ELSE()
+         	SET(STATUS_SNDIO "<not found or not supported on this platform>")
+ 	ENDIF(SNDIO_FOUND)
+-ENDIF(LMMS_BUILD_OPENBSD)
++ENDIF(WANT_SNDIO)
+ 
+ # check for WINE
+ IF(WANT_VST)
diff --git a/srcpkgs/lmms/template b/srcpkgs/lmms/template
index 35d39da3fb6..c8e93b3e566 100644
--- a/srcpkgs/lmms/template
+++ b/srcpkgs/lmms/template
@@ -1,7 +1,7 @@
 # Template file for 'lmms'
 pkgname=lmms
 version=1.2.0rc5
-revision=2
+revision=3
 wrksrc="lmms-${version/r/-r}"
 _x11embed_commit=022b39a1d496d72eb3e5b5188e5559f66afca957
 _rpmalloc_commit=2e0479192b8dfb15e0084969fdf06208cffbfd09
@@ -11,7 +11,8 @@ hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules"
 #missing optional depend libstk for STK instruments plugins
 makedepends="SDL_sound-devel fltk-devel fluidsynth-devel jack-devel ladspa-sdk
  lame-devel libsamplerate-devel portaudio-devel qt5-tools-devel
- qt5-x11extras-devel redland-devel xcb-util-devel xcb-util-keysyms-devel"
+ qt5-x11extras-devel redland-devel xcb-util-devel xcb-util-keysyms-devel
+ sndio-devel"
 depends="desktop-file-utils"
 short_desc="Cross-platform music production software"
 maintainer="Logen K. <logen@sudotask.com>"
@@ -29,6 +30,10 @@ case $XBPS_TARGET_MACHINE in
 esac
 
 post_extract() {
-	mv ${wrksrc}/../qt5-x11embed-${_x11embed_commit}/* src/3rdparty/qt5-x11embed
-	mv ${wrksrc}/../rpmalloc-${_rpmalloc_commit}/* src/3rdparty/rpmalloc/rpmalloc
+	[ -d "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" ] &&
+		rm -rf src/3rdparty/qt5-x11embed &&
+		mv "${wrksrc}/../qt5-x11embed-${_x11embed_commit}" src/3rdparty/qt5-x11embed
+	[ -d "${wrksrc}/../rpmalloc-${_rpmalloc_commit}" ] &&
+		rm -rf src/3rdparty/rpmalloc/rpmalloc &&
+		mv "${wrksrc}/../rpmalloc-${_rpmalloc_commit}" src/3rdparty/rpmalloc/rpmalloc
 }