diff --git a/.cvsignore b/.cvsignore
index 97a8fa9..e4bbadb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-meld3-0.6.4.tar.gz
+meld3-0.6.5.tar.gz
diff --git a/meld3-etree.patch b/meld3-etree.patch
deleted file mode 100644
index 36e5710..0000000
--- a/meld3-etree.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: meld3-0.6.4/meld3/meld3.py
-===================================================================
---- meld3-0.6.4.orig/meld3/meld3.py
-+++ meld3-0.6.4/meld3/meld3.py
-@@ -5,21 +5,41 @@ import types
- import mimetools
- from StringIO import StringIO
- 
--from elementtree.ElementTree import TreeBuilder
--from elementtree.ElementTree import XMLTreeBuilder
--from elementtree.ElementTree import Comment
--from elementtree.ElementTree import ProcessingInstruction
--from elementtree.ElementTree import QName
--from elementtree.ElementTree import _raise_serialization_error
--from elementtree.ElementTree import _namespace_map
--from elementtree.ElementTree import fixtag
--from elementtree.ElementTree import parse as et_parse
--from elementtree.ElementTree import ElementPath
--from elementtree.HTMLTreeBuilder import HTMLParser
--from elementtree.HTMLTreeBuilder import IGNOREEND
--from elementtree.HTMLTreeBuilder import AUTOCLOSE
--from elementtree.HTMLTreeBuilder import is_not_ascii
--
-+try:
-+    # Try to import the definitions from the python-2.5 locations
-+    from xml.etree.ElementTree import TreeBuilder
-+except ImportError:
-+    # Fallback on elementtree
-+    from elementtree.ElementTree import TreeBuilder
-+    from elementtree.ElementTree import XMLTreeBuilder
-+    from elementtree.ElementTree import Comment
-+    from elementtree.ElementTree import ProcessingInstruction
-+    from elementtree.ElementTree import QName
-+    from elementtree.ElementTree import _raise_serialization_error
-+    from elementtree.ElementTree import _namespace_map
-+    from elementtree.ElementTree import fixtag
-+    from elementtree.ElementTree import parse as et_parse
-+    from elementtree.ElementTree import ElementPath
-+    from elementtree.HTMLTreeBuilder import HTMLParser
-+    from elementtree.HTMLTreeBuilder import IGNOREEND
-+    from elementtree.HTMLTreeBuilder import AUTOCLOSE
-+    from elementtree.HTMLTreeBuilder import is_not_ascii
-+else:
-+    from xml.etree.ElementTree import XMLTreeBuilder
-+    from xml.etree.ElementTree import Comment
-+    from xml.etree.ElementTree import ProcessingInstruction
-+    from xml.etree.ElementTree import QName
-+    from xml.etree.ElementTree import _raise_serialization_error
-+    from xml.etree.ElementTree import _namespace_map
-+    from xml.etree.ElementTree import fixtag
-+    from xml.etree.ElementTree import parse as et_parse
-+    from xml.etree.ElementTree import ElementPath
-+    # Elementtree 1.2.6 snpshot 20050316 defines things this way so we might
-+    # as well too.
-+    from HTMLParser import HTMLParser
-+    IGNOREEND = "img", "hr", "meta", "link", "br"
-+    AUTOCLOSE = "p", "li", "tr", "th", "td", "head", "body"
-+    is_not_ascii = re.compile(eval(r'u"[\u0080-\uffff]"')).search
- 
- # replace element factory
- def Replace(text, structure=False):
diff --git a/python-meld3.spec b/python-meld3.spec
index 06dab80..d883f67 100644
--- a/python-meld3.spec
+++ b/python-meld3.spec
@@ -1,17 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: An HTML/XML templating system for Python
 Name: python-meld3
-Version: 0.6.4
-Release: 4%{?dist}
+Version: 0.6.5
+Release: 1%{?dist}
 
 License: ZPLv2.0
 Group: Development/Languages
 URL: http://www.plope.com/software/meld3/
 Source0: http://www.plope.com/software/meld3/meld3-%{version}.tar.gz
-# 0.6.4 is a bit broken.  This file is missing from the tarball.
-Source1: http://svn.supervisord.org/meld3/trunk/meld3/cmeld3.c
-# Fix problems importing python-2.5's elementtree.
-Patch0: meld3-etree.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %if 0%{?fedora} <= 6
@@ -29,8 +25,6 @@ http://www.entrian.com/PyMeld for a treatise on the benefits of this pattern.
 
 %prep
 %setup -q -n meld3-%{version}
-cp %{SOURCE1} meld3/cmeld3.c
-%patch0 -p1 -b .etree
 
 %build
 export USE_MELD3_EXTENSION_MODULES=True
@@ -52,6 +46,10 @@ chmod 0755 %{buildroot}/%{python_sitearch}/meld3/cmeld3.so
 %{python_sitearch}/*
 
 %changelog
+* Tue Apr 13 2010 Nils Philippsen <nils@redhat.com> - 0.6.5-1
+- version 0.6.5
+- drop obsolete etree patch
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 56953c2..7f118ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fcb7496e20068155f6dd7d227edb76e  meld3-0.6.4.tar.gz
+65b1f926050bffc04495f7113948e940  meld3-0.6.5.tar.gz