diff --git a/CHANGES b/CHANGES
index 1542e883490..6e93c01fb05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,9 @@ Features added
 Bugs fixed
 ----------
 
+* #8925: LaTeX: 3.5.1 ``verbatimmaxunderfull`` setting does not work as
+  expected
+
 Testing
 --------
 
diff --git a/sphinx/texinputs/sphinx.sty b/sphinx/texinputs/sphinx.sty
index e6c27c123ee..23c97dcdf70 100644
--- a/sphinx/texinputs/sphinx.sty
+++ b/sphinx/texinputs/sphinx.sty
@@ -1271,8 +1271,21 @@
     \fi\fi
 }%
 % auxiliary paragraph dissector to get max and min widths
+% but minwidth must not take into account the last line
 \newbox\spx@scratchbox
 \def\spx@verb@getwidths {%
+    \unskip\unpenalty
+    \setbox\spx@scratchbox\lastbox
+    \ifvoid\spx@scratchbox
+    \else
+       \setbox\spx@scratchbox\hbox{\unhbox\spx@scratchbox}%
+       \ifdim\spx@verb@maxwidth<\wd\spx@scratchbox
+          \xdef\spx@verb@maxwidth{\number\wd\spx@scratchbox sp}%
+       \fi
+       \expandafter\spx@verb@getwidths@loop
+    \fi
+}%
+\def\spx@verb@getwidths@loop {%
     \unskip\unpenalty
     \setbox\spx@scratchbox\lastbox
     \ifvoid\spx@scratchbox
@@ -1284,7 +1297,7 @@
        \ifdim\spx@verb@minwidth>\wd\spx@scratchbox
           \xdef\spx@verb@minwidth{\number\wd\spx@scratchbox sp}%
        \fi
-       \expandafter\spx@verb@getwidths
+       \expandafter\spx@verb@getwidths@loop
     \fi
 }%
 % auxiliary macros to implement "cut long line even in middle of word"