diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3c8fb8eda..b71663693 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-19  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* lisp/org-exp-blocks.el (org-export-blocks-format-ditaa): Catch
+	lines that have no space after the colon.
+
 2008-12-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* lisp/org-browser-url.el: New file.
diff --git a/contrib/lisp/org-exp-blocks.el b/contrib/lisp/org-exp-blocks.el
index e5442285e..260b42997 100644
--- a/contrib/lisp/org-exp-blocks.el
+++ b/contrib/lisp/org-exp-blocks.el
@@ -183,7 +183,7 @@ passed to the ditaa utility as command line arguments."
       (error (format "Could not find ditaa.jar at %s" org-ditaa-jar-path)))
     (setq body (if (string-match "^\\([^:\\|:[^ ]\\)" body)
 		   body
-		 (mapconcat (lambda (x) (substring x 2))
+		 (mapconcat (lambda (x) (substring x (> (length x) 1) 2 1))
 			    (org-split-string body "\n")
 			    "\n")))
     (cond