diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 11807dc..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xmldiff-0.6.7.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d5b6705
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xmldiff-0.6.8.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 94f0700..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmldiff
-# $Id$
-NAME := xmldiff
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/sources b/sources
index a5da2e3..67b5501 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07b97c97a0b83d605f37c712400e24ff  xmldiff-0.6.7.tar.gz
+bc1e184e45ce7f9c6beedda76fbeaa16  xmldiff-0.6.8.tar.gz
diff --git a/xmldiff-0.6.8-importorder.patch b/xmldiff-0.6.8-importorder.patch
new file mode 100644
index 0000000..a5a68ec
--- /dev/null
+++ b/xmldiff-0.6.8-importorder.patch
@@ -0,0 +1,28 @@
+diff -uNr xmldiff-0.6.8-original/setup.py xmldiff-0.6.8/setup.py
+--- xmldiff-0.6.8-original/setup.py	2006-12-15 20:20:59.000000000 -0500
++++ xmldiff-0.6.8/setup.py	2006-12-15 20:21:15.000000000 -0500
+@@ -18,9 +18,9 @@
+ # 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ """ Generic Setup script, takes package info from __pkginfo__.py file """
+ 
++from __future__ import nested_scopes
+ __revision__ = '$Id: xmldiff-0.6.8-importorder.patch,v 1.1 2006/12/17 22:15:07 pfrields Exp $'
+ 
+-from __future__ import nested_scopes
+ import os
+ import sys
+ import shutil
+diff -uNr xmldiff-0.6.8-original/test/regrtest.py xmldiff-0.6.8/test/regrtest.py
+--- xmldiff-0.6.8-original/test/regrtest.py	2006-12-15 20:20:59.000000000 -0500
++++ xmldiff-0.6.8/test/regrtest.py	2006-12-15 20:35:30.000000000 -0500
+@@ -1,9 +1,9 @@
+ """
+ xmldiff non regression test
+ """
++from __future__ import nested_scopes
+ __revision__ = "$Id: xmldiff-0.6.8-importorder.patch,v 1.1 2006/12/17 22:15:07 pfrields Exp $"
+ 
+-from __future__ import nested_scopes
+ from os.path import join, basename
+ from cStringIO import StringIO
+ import sys
diff --git a/xmldiff.spec b/xmldiff.spec
index f3ad524..7159101 100644
--- a/xmldiff.spec
+++ b/xmldiff.spec
@@ -1,31 +1,29 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           xmldiff
-Version:        0.6.7
-Release:        8%{?dist}
+Version:        0.6.8
+Release:        1%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
-License:        GPL
+License:        GPLv2+
 URL:            http://www.logilab.org/projects/xmldiff
 Source0:        ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
 Patch1:		xmldiff-0.6.7-clean-tmp.patch
+Patch2:		xmldiff-0.6.8-importorder.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
 BuildRequires:  python-devel
 BuildRequires:	python-logilab-common
-Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   docbook-style-xsl
 Requires:   file
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-# see bug #177083
-ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -39,6 +37,7 @@ H. Garcia-Molina and J. Widom (Stanford University, 1996).
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -73,19 +72,30 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README README.xmlrev doc/*.html doc/*.txt
-%dir %{_datadir}/xml/xmldiff
-%dir %{python_sitearch}/xmldiff
+%{_datadir}/xml/xmldiff/
+%{python_sitearch}/xmldiff/
 %{_bindir}/xmldiff
 %{_bindir}/xmlrev
-%{python_sitearch}/xmldiff/*.py
-%{python_sitearch}/xmldiff/*.pyc
-%{python_sitearch}/xmldiff/*.so
-%{_datadir}/xml/xmldiff/*
 %{_mandir}/man1/*
-%ghost %{python_sitearch}/xmldiff/*.pyo
 
 
 %changelog
+* Fri Dec 15 2006 Paul W. Frields <stickster@gmail.com> - 0.6.8-1
+- New upstream 0.6.8
+- Slight spec file cleaning
+
+* Wed Sep  6 2006 Paul W. Frields <stickster@gmail.com> - 0.6.7-12
+- Unghost pyo file
+
+* Sat Sep  2 2006 Paul W. Frields <stickster@gmail.com> - 0.6.7-11
+- Bump release for FC6 mass rebuild
+
+* Fri Feb 17 2006 Paul W. Frields <stickster@gmail.com> - 0.6.7-10
+- FESCo mandated rebuild
+
+* Sat Feb  4 2006 Paul W. Frields <stickster@gmail.com> - 0.6.7-9
+- Include x86_64 patch and remove ExcludeArch (thanks to Ville Skytta)
+
 * Sat Jan 28 2006 Paul W. Frields <stickster@gmail.com> - 0.6.7-8
 - ExcludeArch includes spurious values from misplaced comment