diff --git a/.cvsignore b/.cvsignore
index 65de50b..51347b4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 pango-1.6.0.tar.bz2
+pango-1.8.0.tar.bz2
diff --git a/pango.spec b/pango.spec
index 8957112..c0176e7 100644
--- a/pango.spec
+++ b/pango.spec
@@ -7,11 +7,11 @@
 
 Summary: System for layout and rendering of internationalized text.
 Name: pango
-Version: 1.6.0
-Release: 7
+Version: 1.8.0
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
-Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.4/pango-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
 URL: http://www.pango.org
 BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 
@@ -31,16 +31,6 @@ Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 Patch1: pango-slighthint.patch
 # Look for pango.modules in an arch-specific directory
 Patch5: pango-1.2.5-lib64.patch
-# Patch from CVS to fix metrics for bitmap fonts
-Patch6: pango-1.5.2-bitmapmetrics.patch
-# Patch from CVS to fix display of U+3000 (#132203)
-Patch7: pango-1.6.0-u3000.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=149438
-Patch8: pango-1.6.0-contextmetrics.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=155897
-Patch9: pango-1.6.0-deletechar.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=155912
-Patch10: pango-1.6.0-attributelen.patch
 
 %description
 Pango is a system for layout and rendering of internationalized text.
@@ -68,21 +58,9 @@ pango.
 
 %patch1 -p1 -b .slighthint
 %patch5 -p1 -b .lib64
-%patch6 -p1 -b .bitmapmetrics
-%patch7 -p1 -b .u3000
-%patch8 -p1 -b .contextmetrics
-%patch9 -p1 -b .deletechar
-%patch10 -p1 -b .attributelen
 
 %build
 
-## FIXME remove this hack when X is fixed
-export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/X11R6/lib64/pkgconfig
-if ! pkg-config --exists xft ; then
-        echo "No xft.pc!"
-        exit 1
-fi
-
 %configure --without-qt --disable-gtk-doc
 make
 
@@ -199,6 +177,10 @@ esac
 
 
 %changelog
+* Tue Dec 21 2004 Matthias Clasen <mclasen@redhat.com> - 1.8.0-1
+- Version 1.8.0
+- Drop unneeded patches and hacks
+
 * Wed Oct 20 2004 Owen Taylor <otaylor@redhat.com> - 1.6.0-7
 - Fix problem with pango_layout_get_attributes returning one too few items
   (Needed to fix problems mentioned in #135656, 
diff --git a/sources b/sources
index 5967630..e1d6ea8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c732bbc5fba5a0f1f8086e8aa4f490d  pango-1.6.0.tar.bz2
+d11f9857df7216321163e14d66d0cab8  pango-1.8.0.tar.bz2