diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90d4a0ce6..3fe807aa7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-06  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-exp.el (org-export-remove-or-extract-drawers): Fix regexp
+	for finding drawers.
+
 	* org.el (org-do-sort): Also take an inactive timestamp if no
 	active one is found.
 
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 9f2275611..cdb978f2b 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -1751,7 +1751,7 @@ whose content to keep."
 		       (org-delete-all exp-drawers
 				       (copy-sequence all-drawers))
 		       "\\|")
-		      "\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
+		      "\\):[ \t]*\n\\([^\000]*?\n\\)?[ \t]*:END:[ \t]*\n")))
       (while (re-search-forward re nil t)
 	(org-if-unprotected
 	 (replace-match ""))))))