diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index f9caec404b..c5dd9a4b71 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1911,7 +1911,8 @@ void Buffer::writeLaTeXSource(otexstream & os,
 					os << "\\catcode`\\%=11"
 					      "\\def\\%{%}\\catcode`\\%=14\n";
 				}
-				bool const detokenize = !isAscii(from_utf8(docdir));
+				bool const detokenize = !isAscii(from_utf8(docdir))
+						|| contains(docdir, '~');
 				bool const quote = contains(docdir, ' ');
 				os << "\\makeatletter\n"
 				   << "\\def\\input@path{{";
diff --git a/status.23x b/status.23x
index b5379d268a..a4c3078826 100644
--- a/status.23x
+++ b/status.23x
@@ -35,7 +35,8 @@ Avoid using text mode for unicode symbols representable in math mode (bug 9616).
 
 * DOCUMENTATION AND LOCALIZATION
 
-- The Dutch user interface localization has been revived.
+- The Dutch user interface localization has been revived, and the Dutch docs
+  revised.
 
 
 * BUILD/INSTALLATION
@@ -58,6 +59,8 @@ Avoid using text mode for unicode symbols representable in math mode (bug 9616).
   unicodesymbols file, unless it can be encoded in the document encoding
   (bug 11586).
 
+- Fix problems with paths that contain the tilde (~) character.
+
 
 * USER INTERFACE