diff --git a/.cvsignore b/.cvsignore
index 5db7682..70098ff 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kid-0.9.5.tar.gz
+kid-0.9.6.tar.gz
diff --git a/python-kid-0.9.4-py-def.patch b/python-kid-0.9.4-py-def.patch
deleted file mode 100644
index 1bc10c7..0000000
--- a/python-kid-0.9.4-py-def.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: trunk/kid/codewriter.py
-===================================================================
---- trunk/kid/codewriter.py (revision 441)
-+++ trunk/kid/codewriter.py (revision 442)
-@@ -248,10 +248,10 @@
-             old_code = code
-             if '(' not in decl:
--                decl = decl + '()'
-+                decl += '()'
-             name, args = decl.split('(', 1)
--            pos = args.rfind(')')
--            args = args[0:pos].strip()
--            self_ = args and 'self, ' or 'self'
--            class_decl = '%s(%s%s)' % (name, self_, args)
-+            args = args.lstrip()
-+            if not args.startswith(')'):
-+                args = ', ' + args
-+            class_decl = '(self'.join((name, args))
- 
-             # module function code
-@@ -271,6 +271,6 @@
-             self.match_proc(item, attrib, code)
-             code.end_block()
--            code.start_block('def %s:' % class_decl)
--            code.line('return ElementStream(self.__%s(%s))' % (name, args))
-+            code.start_block('def %s(self, *args, **kw):' % name)
-+            code.line('return ElementStream(self.__%s(*args, **kw))' % name)
-             code.end_block()
-             if attr_name == QNAME_SLOT:
-Index: trunk/test/test_def.kid
-===================================================================
---- trunk/test/test_def.kid (revision 421)
-+++ trunk/test/test_def.kid (revision 442)
-@@ -9,4 +9,5 @@
- ?>
- <testdoc xmlns:py="http://purl.org/kid/ns#">
-+
-   <test>
-     <attempt py:content="template1()" />
-@@ -22,14 +23,14 @@
-     <h1>Some Fruit</h1>
-     <dl>
--      
-+
-       <dt>orange</dt>
-       <dd>A juicy fruit from Florida mostly.</dd>
--      
-+
-       <dt>m&amp;m's</dt>
-       <dd>melts in your mouth not in your hand.</dd>
--      
-+
-       <dt>apple</dt>
-       <dd>A red fruit that hurts my teeth.</dd>
--      
-+
-     </dl>
-   </test3></expect>
-@@ -38,5 +39,5 @@
-   <!-- define a template inline -->
-   <p py:def="inline_test">a test paragraph</p>
--  
-+
-   <test>
-     <attempt py:content="inline_test()"/>
-@@ -49,4 +50,14 @@
-   </test>
- 
-+  <p py:def="hello_world(x='World')" py:strip="">${x}</p>
-+
-+  <test>
-+    <attempt><p py:replace="hello_world(x='Hello')"/>,
-+    <p py:replace="hello_world()"/>!</attempt>
-+    <expect>Hello,
-+    World!</expect>
-+  </test>
-+
-   <!-- XXX need a recursive test -->
-+
- </testdoc>
diff --git a/python-kid.spec b/python-kid.spec
index 66d5090..81f6c3f 100644
--- a/python-kid.spec
+++ b/python-kid.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-kid
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 Summary:        Kid - A simple and pythonic XML template language
 
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 17 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.9.6-1
+- Upstream 0.9.6
+
 * Sun Jan 28 2007 Konstantin Ryabitsev <icon@fedoraproject.org> - 0.9.5-1
 - Upstream 0.9.5
 - Drop the py-def patch
diff --git a/sources b/sources
index d9f781a..b4eb863 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-61545377ea95704852bf5a894f7cae26  kid-0.9.5.tar.gz
+31e7156698a6f214b4067afb9e13728f  kid-0.9.6.tar.gz