--- a/guile-1.8.8-r1.ebuild	2011-07-09 13:31:12.000000000 +0200
+++ b/guile-1.8.8-r2.ebuild	2011-08-31 14:36:22.000000000 +0200
@@ -10,11 +10,12 @@
 SRC_URI="mirror://gnu/guile/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads"
 RESTRICT="!regex? ( test )"
 
 DEPEND="
+	app-admin/eselect-guile
 	>=dev-libs/gmp-4.1
 	>=sys-devel/libtool-1.5.6
 	sys-devel/gettext
@@ -39,6 +40,8 @@
 
 	#will fail for me if posix is disabled or without modules -- hkBst
 	econf \
+		--program-suffix="-${MAJOR}" \
+		--infodir="${EPREFIX}"/usr/share/info/guile-${MAJOR} \
 		--disable-error-on-warning \
 		--disable-static \
 		--enable-posix \
@@ -69,13 +72,17 @@
 }
 
 src_install() {
-	einstall || die "install failed"
+	einstall infodir="${ED}"/usr/share/info/guile-${MAJOR} || die "install failed"
+
+	# Maybe there is a proper way to do this? Symlink handled by eselect
+	mv "${ED}"/usr/share/aclocal/guile.m4 "${ED}"/usr/share/aclocal/guile-${MAJOR}.m4 || die "rename of guile.m4 failed"
 
 	dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die
 
-	# texmacs needs this, closing bug #23493
-	dodir /etc/env.d
-	echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
+	# Now handled by app-admin/eselect-guile
+	## texmacs needs this, closing bug #23493
+	#dodir /etc/env.d
+	#echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
 
 	# necessary for registering slib, see bug 206896
 	keepdir /usr/share/guile/site
@@ -89,10 +96,12 @@
 pkg_postinst() {
 	[ "${EROOT}" == "/" ] && pkg_config
 	use emacs && elisp-site-regen
+	eselect guile update ifunset
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
+	eselect guile update ifunset
 }
 
 pkg_config() {