diff --git a/ChangeLog b/ChangeLog
index c8c5b9ab..b5ee71a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 16 22:28:48 PDT 2008 William Brack <wbrack@mmm.com.hk>
+
+	* pattern.c: fix problem with xmlStreamPop when pattern includes
+	  a "." element (see discussion on libxslt list)
+
 Mon Jul  7 15:49:59 CEST 2008 Daniel Veillard <daniel@veillard.com>
 
 	* SAX2.c: fix line number on text nodes, problem raised by Ralf Junker
diff --git a/pattern.c b/pattern.c
index ee519684..0e38c2dd 100644
--- a/pattern.c
+++ b/pattern.c
@@ -2285,9 +2285,13 @@ xmlStreamPop(xmlStreamCtxtPtr stream) {
 	if (stream->blockLevel == stream->level)
 	    stream->blockLevel = -1;
 
-	stream->level--;
-	if (stream->level < 0)
-	    return(-1);		
+	/*
+	 *  stream->level can be zero when XML_FINAL_IS_ANY_NODE is set
+	 *  (see the thread at
+	 *  http://mail.gnome.org/archives/xslt/2008-July/msg00027.html)
+	 */
+	if (stream->level)
+	    stream->level--;
 	/*
 	 * Check evolution of existing states
 	 */