diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ebbd6720..747e710f8 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-04  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-scan-tags): Improve tag inheritance.
+
 2009-03-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-add-planning-info): Fix bug with looking for keyword
diff --git a/lisp/org.el b/lisp/org.el
index 88174f308..abdd77474 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9822,6 +9822,8 @@ only lines with a TODO keyword are included in the output."
 		    (apply 'append (mapcar 'cdr (reverse tags-alist)))
 		  tags))
 	  (when org-use-tag-inheritance
+	    (setcdr (car tags-alist)
+		    (org-remove-uniherited-tags (cdar tags-alist)))
 	    (setcdr (car tags-alist)
 		    (mapcar (lambda (x)
 			      (setq x (copy-sequence x))