diff --git a/ChangeLog b/ChangeLog
index c4a33d857..d6875cca2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* lisp/org.el (org-op-to-function, org<>, org-string<=)
 	(org-string>=, org-string<>): New functions.
+	(org-property-re): Make sure the value contains a non-white
+	character. 
 
 2008-04-21  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/lisp/org.el b/lisp/org.el
index 0f3755051..6d75e3ab7 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3580,7 +3580,7 @@ between words."
 
 (defvar org-font-lock-keywords nil)
 
-(defconst org-property-re (org-re "^[ \t]*\\(:\\([[:alnum:]_]+\\):\\)[ \t]*\\(\\S-.*\\)")
+(defconst org-property-re (org-re "^[ \t]*\\(:\\([[:alnum:]_]+\\):\\)[ \t]*\\([^ \t\r\n].*\\)")
   "Regular expression matching a property line.")
 
 (defun org-set-font-lock-defaults ()