diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1205449cb..bbcd839f4 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-08  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.el (org-scan-tags): Fix bug in tag scanner
+
 2009-04-07  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-modules): Mark obsolete packages.
diff --git a/lisp/org.el b/lisp/org.el
index 73435cd21..e32220936 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10055,7 +10055,7 @@ only lines with a TODO keyword are included in the output."
 	(catch :skip
 	  (setq todo (if (match-end 1) (org-match-string-no-properties 2))
 		tags (if (match-end 4) (org-match-string-no-properties 4)))
-	  (goto-char (setq lspos (1+ (match-beginning 0))))
+	  (goto-char (setq lspos (match-beginning 0)))
 	  (setq level (org-reduced-level (funcall outline-level))
 		category (org-get-category))
 	  (setq i llast llast level)