diff --git a/NEWS b/NEWS
index bc432fc12..96cd0cd46 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ ver 0.20 (not yet released)
 * output
   - pulse: set channel map to WAVE-EX
 
+ver 0.19.5 (not yet released)
+* decoder
+  - dsdiff, dsf, opus: fix deadlock while seeking
+
 ver 0.19.4 (2014/11/18)
 * protocol
   - workaround for buggy clients that send "add /"
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e0aef7757..02401c699 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="7"
-          android:versionName="0.19.1">
+          android:versionCode="8"
+          android:versionName="0.19.4">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17"/>
 
diff --git a/doc/protocol.xml b/doc/protocol.xml
index a85bbbc86..a0145053a 100644
--- a/doc/protocol.xml
+++ b/doc/protocol.xml
@@ -1533,6 +1533,7 @@ OK
               <command>count</command>
               <arg choice="req"><replaceable>TAG</replaceable></arg>
               <arg choice="req"><replaceable>NEEDLE</replaceable></arg>
+              <arg choice="opt"><replaceable>...</replaceable></arg>
               <arg choice="opt">group</arg>
               <arg choice="opt"><replaceable>GROUPTYPE</replaceable></arg>
             </cmdsynopsis>
diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx
index 5e995fed4..13f6bc846 100644
--- a/src/decoder/plugins/DsdLib.cxx
+++ b/src/decoder/plugins/DsdLib.cxx
@@ -53,7 +53,7 @@ dsdlib_skip_to(Decoder *decoder, InputStream &is,
 	       offset_type offset)
 {
 	if (is.IsSeekable())
-		return is.Seek(offset, IgnoreError());
+		return is.LockSeek(offset, IgnoreError());
 
 	if (is.GetOffset() > offset)
 		return false;
@@ -72,7 +72,7 @@ dsdlib_skip(Decoder *decoder, InputStream &is,
 		return true;
 
 	if (is.IsSeekable())
-		return is.Seek(is.GetOffset() + delta, IgnoreError());
+		return is.LockSeek(is.GetOffset() + delta, IgnoreError());
 
 	if (delta > 1024 * 1024)
 		/* don't skip more than one megabyte; it would be too
diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx
index 25497fe8a..e14827e38 100644
--- a/src/decoder/plugins/OpusDecoderPlugin.cxx
+++ b/src/decoder/plugins/OpusDecoderPlugin.cxx
@@ -214,7 +214,7 @@ LoadEOSPacket(InputStream &is, Decoder *decoder, int serialno,
 	ogg_stream_clear(&os);
 
 	/* restore the previous file position */
-	is.Seek(old_offset, IgnoreError());
+	is.LockSeek(old_offset, IgnoreError());
 
 	return result;
 }
diff --git a/src/java/File.hxx b/src/java/File.hxx
index 3636fc7c6..a569fe214 100644
--- a/src/java/File.hxx
+++ b/src/java/File.hxx
@@ -28,7 +28,7 @@
  */
 
 #ifndef JAVA_FILE_HXX
-#define JAVA_FILE_HPP
+#define JAVA_FILE_HXX
 
 #include "Object.hxx"