diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70c14bd37..0968c23e9 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-07-26  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-agenda.el (org-agenda-align-tags): Fix bug with malformed
+	face property.
+
 	* org-colview.el (org-columns-display-here): Use
 	`org-columns-modify-value-for-display-function'.
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 9a7ed8b6b..33c2a3981 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4768,8 +4768,12 @@ the new TODO state."
 				(if line (point-at-eol) nil) t)
 	(add-text-properties
 	 (match-beginning 2) (match-end 2)
-	 (list 'face (delq nil (list 'org-tag (get-text-property
-					       (match-beginning 2) 'face)))))
+	 (list 'face (delq nil (adjoin 'org-tag
+                                       (let ((prop (get-text-property
+                                                    (match-beginning 2) 'face)))
+                                         (if (listp prop)
+                                             prop
+                                           (list prop)))))))
 	(setq l (- (match-end 2) (match-beginning 2))
 	      c (if (< org-agenda-tags-column 0)
 		    (- (abs org-agenda-tags-column) l)