--- /usr/portage/app-emacs/org-mode/org-mode-7.9.2.ebuild	2012-12-09 10:31:03.000000000 +0000
+++ org-mode-8.0.1.ebuild	2013-04-22 20:44:47.913327119 +0100
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/app-emacs/org-mode/org-mode-7.9.2.ebuild,v 1.6 2012/12/09 10:23:41 ulm Exp $
 
 EAPI=4
-NEED_EMACS=22
+NEED_EMACS=23
 
 inherit elisp
 
@@ -24,6 +24,7 @@
 # the right Emacs version.
 ELISP_REMOVE="lisp/org-install.el"
 SITEFILE="50${PN}-gentoo.el"
+ORG_ADD_CONTRIB="org*"
 
 src_compile() {
 	emake
@@ -41,7 +42,7 @@
 	if use contrib; then
 		elisp-install ${PN}/contrib contrib/lisp/*org*.el || die
 		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/babel contrib/scripts
+		doins -r contrib/README contrib/scripts
 		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
 			-exec rm -f '{}' '+'
 		# add the contrib subdirectory to load-path
@@ -50,6 +51,6 @@
 	fi
 
 	elisp-site-file-install "${T}/${SITEFILE}" || die
-	dodoc README doc/orgcard.txt etc/ORG-NEWS
+	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 }