--- a/modules/pathologic/pathologic.module
+++ b/modules/pathologic/pathologic.module
@@ -169,6 +169,11 @@
   // Now parse the URL after reverting HTML character encoding.
   // @see [#1672932]
   $parts = parse_url(htmlspecialchars_decode($matches[2]));
+  // Any query parts will be rawurldecoded() by parse_str() later on, but
+  // a path component won't be, so make sure we don't double-encode when
+  // running the path through url() later.
+  // @see [#1672932]
+  if (isset($parts['path'])) $parts['path'] = rawurldecode($parts['path']);
   // Do some more early tests to see if we should just give up now.
   if (
     // If parse_url() failed, give up.