diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41f373435..2b2290c5a 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-01  Dan Davison  <davison@stats.ox.ac.uk>
+
+	* org-exp-blocks.el: Modify split separator regexp to avoid empty
+	strings.
+
 2009-11-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-src.el (org-src-preserve-indentation): Document that this
diff --git a/lisp/org-exp-blocks.el b/lisp/org-exp-blocks.el
index a78da004f..258d863c7 100644
--- a/lisp/org-exp-blocks.el
+++ b/lisp/org-exp-blocks.el
@@ -176,7 +176,7 @@ specified in BLOCKS which default to the value of
 		"^\\([ \t]*\\)#\\+begin_\\(\\S-+\\)[ \t]*\\(.*\\)?[\r\n]\\([^\000]*?\\)[\r\n][ \t]*#\\+end_\\S-+.*" nil t)
           (setq indentation (length (match-string 1)))
 	  (setq type (intern (match-string 2)))
-	  (setq headers (save-match-data (split-string (match-string 3) "[ \t]")))
+	  (setq headers (save-match-data (org-split-string (match-string 3) "[ \t]+")))
 	  (setq body (match-string 4))
 	  (setq preserve-indent (or org-src-preserve-indentation (member "-i" headers)))
 	  (unless preserve-indent