diff --git a/.cvsignore b/.cvsignore
index a96ebb9..b0ca1b4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 fonttools-2.2.tar.gz
+fonttools-2.3.tar.gz
diff --git a/fonttools-as.patch b/fonttools-as.patch
deleted file mode 100644
index 08a8df7..0000000
--- a/fonttools-as.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: Lib/fontTools/ttLib/tables/ttProgram.py
-===================================================================
---- Lib/fontTools/ttLib/tables/ttProgram.py	(revision 562)
-+++ Lib/fontTools/ttLib/tables/ttProgram.py	(revision 563)
-@@ -394,7 +394,7 @@
- 	
- 	p = Program()
- 	p.fromBytecode(bc)
--	as = p.getAssembly()
--	p.fromAssembly(as)
-+	asm = p.getAssembly()
-+	p.fromAssembly(asm)
- 	print bc == p.getBytecode()
- 
diff --git a/fonttools.spec b/fonttools.spec
index 48e68cd..2b47546 100644
--- a/fonttools.spec
+++ b/fonttools.spec
@@ -1,9 +1,11 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
 
 Name:           fonttools
-Version:        2.2
-Release:        8%{?dist}
+Version:        2.3
+Release:        1%{?dist}
 Summary:        A tool to convert True/OpenType fonts to XML and back
 
 Group:          Development/Tools
@@ -15,8 +17,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel numpy
 Requires:       numpy
 
-Patch0:         fonttools-as.patch
-
 Provides:       ttx = %{version}-%{release}
 
 %description
@@ -27,10 +27,9 @@ TrueType and OpenType fonts to an XML-based text format and vice versa.
 
 %prep
 %setup -q
-%patch0 -p0 -b .as
 
-%{__sed} -i.nobang '1 d' Lib/fontTools/ttx.py
-%{__chmod} a-x LICENSE.txt
+sed -i.nobang '1 d' Lib/fontTools/ttx.py
+chmod a-x LICENSE.txt
 
 
 %build
@@ -42,8 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/ttLib/test
 chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/FontTools/fontTools/misc/eexecOp.so
-mkdir -p -m 0755 ${RPM_BUILD_ROOT}%{_mandir}/man1
-mv $RPM_BUILD_ROOT/usr/man/man1/ttx.1 $RPM_BUILD_ROOT/%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -52,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt
-%doc Doc/ChangeLog.txt Doc/changes.txt Doc/documentation.html
+%doc Doc/ChangeLog Doc/changes.txt Doc/documentation.html
 %{python_sitearch}/FontTools.pth
 %dir %{python_sitearch}/FontTools
 %dir %{python_sitearch}/FontTools/fontTools
@@ -73,6 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 23 2010 Akira TAGOH <tagoh@redhat.com> - 2.3-1
+- New upstream release. (Paul Williams, #599281)
+  - drop upstreamed patch.
+  - correct man page location.
+- Update the spec file to keep consistensy of usage in the macro as far as possible.
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index dc95c87..9436df2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-639c68113cc04e8f30ae8997d6cc480a  fonttools-2.2.tar.gz
+502cdf6662e1d075f1902fbd995eaace  fonttools-2.3.tar.gz