--- postgis-2.0.0.ebuild
+++ postgis-2.0.1.ebuild
@@ -62,6 +62,10 @@
 #	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cheatsheet.patch"
+}
+
 src_configure() {
 	local myargs=""
 	use gtk && myargs+=" --with-gui"
@@ -74,7 +78,7 @@
 	# Otherwise, it'd be fine.
 	emake
 	emake -C topology
-	use doc && emake -C doc
+	use doc && emake -C doc cheatsheets comments html
 }
 
 src_install() {
@@ -89,7 +93,10 @@
 	dobin ./utils/postgis_restore.pl
 
 	if use doc; then
-		cd doc/html
+		docinto html
+		cd doc
+		dohtml -r *.html
+		cd html
 		dohtml -r *
 	fi
 
@@ -98,8 +105,6 @@
 
 	cd "${S}/doc"
 	doman man/*
-	insinto /usr/share/postgresql-${PGSLOT}/contrib/postgis-${PGIS}/
-	doins postgis_comments.sql
 }
 
 pkg_postinst() {