--- firebird-2.5.0.26074.0-r2.ebuild_orig	2011-10-11 02:35:18.223517911 -0400
+++ firebird-2.5.0.26074.0-r2.ebuild	2011-10-11 02:36:15.886262417 -0400
@@ -78,7 +78,7 @@
 	epatch "${FILESDIR}/${P}-deps-flags.patch"
 
 	use client && epatch "${FILESDIR}/${P}-client.patch"
-	if ! use superserver ; then
+	if ! use superserver && ! use xinetd ; then
 		epatch "${FILESDIR}/${P}-superclassic.patch"
 	fi
 
@@ -139,8 +139,8 @@
 	cd "${S}/gen/${PN}"
 
 	if use doc; then
-		dodoc docs/*.pdf
-		dodoc "${WORKDIR}"/manuals/*
+		dodoc "${S}"/doc/*.pdf
+		dodoc "${WORKDIR}"/manuals/*/*.{pdf,PDF}
 	fi
 
 	insinto /usr/include