--- a/culmus-0.101-r1.ebuild	2008-03-29 17:06:10.000000000 +0100
+++ b/culmus-0.101-r1.ebuild	2008-04-05 16:04:29.000000000 +0200
@@ -11,29 +11,30 @@
 	http://culmus.sourceforge.net/fancy/ozrad.tar.gz
 	http://culmus.sourceforge.net/fancy/gan.tar.gz
 	http://culmus.sourceforge.net/fancy/comix.tar.gz
 	http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz"
 HOMEPAGE="http://culmus.sourceforge.net/"
-KEYWORDS="alpha amd64 arm ia64 ppc s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
 IUSE=""
 
+S="${WORKDIR}/${P}"
+FONT_S="${S}"
 FONT_SUFFIX="afm pfa"
-DOCS="CHANGES LICENSE LICENSE-BITSTREAM"
+FONT_CONF=( "${FONT_S}/65-culmus.conf" )
+DOCS="CHANGES"
 
 src_unpack() {
 	unpack ${A}
-	mv *.{afm,pfa} ${S}
+	cd "${FONT_S}"
+	mv culmus.conf 65-culmus.conf
 }
 
 src_install () {
 	font_src_install
-
-	insinto /etc/fonts/conf.d/
-	doins culmus.conf
-	dosym /etc/fonts/conf.d/culmus.conf /etc/fonts/conf.d/10-culmus.conf
+	dosym ../fonts/conf.avail/65-culmus.conf /etc/fonts/conf.d/65-culmus.conf
 }
 
 pkg_postinst() {
 	elog "Please add ${FONTPATH} to your FontPath"
 	elog "in XF86Config to make the fonts available to all X11 apps and"