diff --git a/.cvsignore b/.cvsignore
index a5832d3..c1f7629 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gtk-doc-1.7.tar.bz2
+gtk-doc-1.8.tar.bz2
diff --git a/gtk-doc.spec b/gtk-doc.spec
index d989cfa..26e6030 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,10 +1,10 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.7
-Release: 3%{?dist}
+Version: 1.8
+Release: 1%{?dist}
 License: LGPL
 Group: Development/Tools
-Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.6/gtk-doc-%{version}.tar.bz2 
+Source: http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.8/gtk-doc-%{version}.tar.bz2 
 Patch0: gtk-doc-1.7-docdir.patch
 BuildArch: noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,6 +20,14 @@ Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 
 Requires: docbook-utils jade /usr/bin/cmp libxslt docbook-style-xsl
+# we are installing an automake macro
+Requires: automake
+# we are installing a .pc file
+Requires: pkgconfig
+# we are installing a .omf file
+Requires: scrollkeeper
+# we are installing an sgml catalog
+Requires: sgml-common
 
 Source1: filter-requires-gtk-doc.sh
 %define __perl_requires %{SOURCE1}
@@ -44,8 +52,9 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
+# --disable-scrollkeeper is not enough
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
@@ -71,6 +80,10 @@ scrollkeeper-update -q
 %{_datadir}/omf/gtk-doc/
 
 %changelog
+* Wed Feb 21 2007 Matthias Clasen <mclasen@redhat.com> - 1.8-1
+- Update to 1.8
+- Fix some directory ownership issues
+
 * Fri Feb  2 2007 Matthias Clasen <mclasen@redhat.com> - 1.7-3
 - Fix the omf file (#223684)
 
diff --git a/sources b/sources
index 7af021b..23600f3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2543a3f5a7b5347fb135855ca55adea1  gtk-doc-1.7.tar.bz2
+e61595df21431db28c83fe4c7d4a4fa8  gtk-doc-1.8.tar.bz2