diff --git a/ChangeLog b/ChangeLog
index f9b64912f6..5392b80a43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
+	  fixed invalid namespace handling bug.
+
 Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/lib/openssl/ssl.rb
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 1030c8f5d4..fb6c55fb72 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -229,7 +229,7 @@ module RSS
       ns = @ns_stack.last.dup
       attrs = {}
       attributes.each do |n, v|
-        if n =~ /\Axmlns:?/
+        if /\Axmlns(?:\z|:)/ =~ n
           ns[$POSTMATCH] = v
         else
           attrs[n] = v
@@ -256,6 +256,7 @@ module RSS
       tags = @tag_stack.pop
       pr = @proc_stack.pop
       pr.call(text, tags) unless pr.nil?
+      @ns_stack.pop
     end
 
     def text(data)