diff --git a/contrib/babel/lisp/org-babel-comint.el b/contrib/babel/lisp/org-babel-comint.el
index 5d19eb68d..0189c9a2e 100644
--- a/contrib/babel/lisp/org-babel-comint.el
+++ b/contrib/babel/lisp/org-babel-comint.el
@@ -97,7 +97,8 @@ during execution of body."
        (if (and ,remove-echo
 		(string-match
 		 (replace-regexp-in-string
-		  "\n" "\r\n" (regexp-quote ,full-body)) string-buffer))
+		  "\n" "[\r\n]+" (regexp-quote ,full-body))
+		 string-buffer))
            (setq raw (substring string-buffer (match-end 0))))
        (split-string string-buffer comint-prompt-regexp))))