diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3a0c2936db..464a3b11ce8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/shr.el (shr-insert): Protect against infloops in degenerate
+	tables.
+
 2013-12-20  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
 
 	* progmodes/octave.el (octave): Add link to manual and octave
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 81a597c2703..4b67bafc5cd 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -461,6 +461,7 @@ size, and full-buffer size."
       (setq shr-state nil)
       (let (found)
 	(while (and (> (current-column) shr-width)
+		    (> shr-width 0)
 		    (progn
 		      (setq found (shr-find-fill-point))
 		      (not (eolp))))