diff --git a/Makefile.am b/Makefile.am
index ecc9c612c..e8b79fadd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1304,6 +1304,7 @@ liboutput_plugins_a_SOURCES = \
 
 MIXER_LIBS = \
 	libmixer_plugins.a \
+	$(ALSA_LIBS) \
 	$(PULSE_LIBS2)
 
 MIXER_API_SRC = \
diff --git a/NEWS b/NEWS
index ac95df66a..d24455c04 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,11 @@ ver 0.20 (not yet released)
 * update
   - apply .mpdignore matches to subdirectories
 
+ver 0.19.12 (2015/12/15)
+* fix assertion failure on malformed UTF-8 tag
+* fix build failure on non-Linux systems
+* fix LimitRTTIME in systemd unit file
+
 ver 0.19.11 (2015/10/27)
 * tags
   - ape: fix buffer overflow
diff --git a/doc/user.xml b/doc/user.xml
index e30b667ca..03dc1b41a 100644
--- a/doc/user.xml
+++ b/doc/user.xml
@@ -2839,7 +2839,8 @@ buffer_size: 16384</programlisting>
           / <ulink
           url="http://icecast.org/"><application>IceCast</application></ulink>.
           HTTP streaming clients like
-          <application>mplayer</application> can connect to it.
+          <application>mplayer</application>, <application>VLC</application>,
+          and <application>mpv</application> can connect to it.
         </para>
 
         <para>
diff --git a/src/tag/TagString.cxx b/src/tag/TagString.cxx
index d30a07a27..bdb32b978 100644
--- a/src/tag/TagString.cxx
+++ b/src/tag/TagString.cxx
@@ -41,9 +41,9 @@ FindInvalidUTF8(const char *p, const char *const end)
 		/* now call the other SequenceLengthUTF8() overload
 		   which also validates the continuations */
 		const size_t t = SequenceLengthUTF8(p);
-		assert(s == t);
 		if (t == 0)
 			return p;
+		assert(s == t);
 
 		p += s;
 	}
diff --git a/systemd/mpd.service.in b/systemd/mpd.service.in
index 6dce7d93d..09a5ad2a5 100644
--- a/systemd/mpd.service.in
+++ b/systemd/mpd.service.in
@@ -8,7 +8,7 @@ ExecStart=@prefix@/bin/mpd --no-daemon
 
 # allow MPD to use real-time priority 50
 LimitRTPRIO=50
-LimitRTTIME=-1
+LimitRTTIME=infinity
 
 # disallow writing to /usr, /bin, /sbin, ...
 ProtectSystem=yes