diff --git a/lisp/ob.el b/lisp/ob.el
index f52fb6bb5..e0949fcb9 100644
--- a/lisp/ob.el
+++ b/lisp/ob.el
@@ -77,7 +77,8 @@
 (declare-function org-list-parse-list "org-list" (&optional delete))
 (declare-function org-list-to-generic "org-list" (LIST PARAMS))
 (declare-function org-list-struct "org-list" ())
-(declare-function org-list-get-bottom-point "org-list" (struct))
+(declare-function org-list-struct-prev-alist "org-list" (struct))
+(declare-function org-list-get-list-end "org-list" (item struct prevs))
 
 (defgroup org-babel nil
   "Code block evaluation and management in `org-mode' documents."
@@ -1583,9 +1584,9 @@ code ---- the results are extracted in the syntax of the source
   (save-excursion
     (cond
      ((org-at-table-p) (progn (goto-char (org-table-end)) (point)))
-     ((org-at-item-p) (save-excursion
-			(org-beginning-of-item)
-			(1- (org-list-get-bottom-point (org-list-struct)))))
+     ((org-at-item-p) (let* ((struct (org-list-struct))
+			     (prevs (org-list-struct-prev-alist struct)))
+			(org-list-get-list-end (point-at-bol) struct prevs)))
      (t
       (let ((case-fold-search t)
 	    (blocks-re (regexp-opt