diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ede7a1e1fc..691c4c1de36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-13  Glenn Morris  <rgm@gnu.org>
+
+	* subr.el (last): Deal with dotted lists (reported in bug#7174).
+
 2010-10-13  Stephen Berman  <stephen.berman@gmx.net>
 
 	* subr.el (last): Use `safe-length' instead of `length' (bug#7206).
diff --git a/lisp/subr.el b/lisp/subr.el
index dabadec770e..8c42e5bd66a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -289,7 +289,7 @@ If LIST is nil, return nil.
 If N is non-nil, return the Nth-to-last link of LIST.
 If N is bigger than the length of LIST, return LIST."
   (if n
-      (and (> n 0)
+      (and (>= n 0)
            (let ((m (safe-length list)))
              (if (< n m) (nthcdr (- m n) list) list)))
     (and list