diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index e47e705c2..571f26c72 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -6,7 +6,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{sphinx}[2017/03/12 v1.5.4 LaTeX package (Sphinx markup)]
+\ProvidesPackage{sphinx}[2017/03/26 v1.5.4 LaTeX package (Sphinx markup)]
 
 % this is the \ltx@ifundefined of ltxcmds.sty, which is loaded by
 % kvoptions (and later by hyperref), but the first release of
@@ -922,11 +922,11 @@
 }}
 % Same for \url. And also \nolinkurl for coherence.
 \protected\def\sphinxurl#1{{%
-    \sphinxunactivateextrasandspace
+    \sphinxunactivateextrasandspace\everyeof{}% (<- precaution for \scantokens)
     \endlinechar\m@ne\scantokens{\url{#1}}%
 }}
 \protected\def\sphinxnolinkurl#1{{%
-    \sphinxunactivateextrasandspace
+    \sphinxunactivateextrasandspace\everyeof{}%
     \endlinechar\m@ne\scantokens{\nolinkurl{#1}}%
 }}
 
diff --git a/sphinx/texinputs/sphinxhowto.cls b/sphinx/texinputs/sphinxhowto.cls
index 7336c697e..4cde44f98 100644
--- a/sphinx/texinputs/sphinxhowto.cls
+++ b/sphinx/texinputs/sphinxhowto.cls
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{sphinxhowto}[2016/10/12 v1.5 Document class (Sphinx HOWTO)]
+\ProvidesClass{sphinxhowto}[2017/03/26 v1.5.4 Document class (Sphinx HOWTO)]
 
 % 'oneside' option overriding the 'twoside' default
 \newif\if@oneside
diff --git a/sphinx/texinputs/sphinxmanual.cls b/sphinx/texinputs/sphinxmanual.cls
index aa2586d0e..ffef03c1a 100644
--- a/sphinx/texinputs/sphinxmanual.cls
+++ b/sphinx/texinputs/sphinxmanual.cls
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesClass{sphinxmanual}[2016/10/12 v1.5 Document class (Sphinx manual)]
+\ProvidesClass{sphinxmanual}[2017/03/26 v1.5.4 Document class (Sphinx manual)]
 
 % chapters starting at odd pages (overridden by 'openany' document option)
 \PassOptionsToClass{openright}{\sphinxdocclass}