diff -urN bibus-1.2.0-orig/Setup/bibus.sh bibus-1.2.0-gentoo/Setup/bibus.sh
--- bibus-1.2.0-orig/Setup/bibus.sh	2006-03-15 22:09:16.000000000 -0600
+++ bibus-1.2.0-gentoo/Setup/bibus.sh	2007-06-14 09:52:16.000000000 -0500
@@ -1,4 +1,4 @@
 #!/bin/sh
 export LD_LIBRARY_PATH=/usr/lib/openoffice/program
 export PYTHONPATH=/usr/lib/openoffice/program
-exec /usr/bin/python /usr/local/share/bibus/bibus.py
+exec /usr/bin/python /usr/share/bibus/bibus.py
diff -urN bibus-1.2.0-orig/Setup/Makefile bibus-1.2.0-gentoo/Setup/Makefile
--- bibus-1.2.0-orig/Setup/Makefile	2006-03-15 22:09:16.000000000 -0600
+++ bibus-1.2.0-gentoo/Setup/Makefile	2007-06-14 09:59:00.000000000 -0500
@@ -1,5 +1,5 @@
 # you presumably will only have to change the three first lines below
-DESTDIR = /usr/local
+DESTDIR = ${D}usr
 python = /usr/bin/python
 oopath = /usr/lib/openoffice/program
 #
@@ -54,21 +54,21 @@
 	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
 	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
 	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
+	echo 'docdir = /usr/share/doc/${PF}/html' >> $(datadir)/bibus/bibus.cfg
+	echo 'licence = /usr/share/doc/${PF}/copying' >> $(datadir)/bibus/bibus.cfg
+	echo 'localedir = /usr/share/locale' >> $(datadir)/bibus/bibus.cfg
+	echo 'systemconf = /etc/bibus.config' >> $(datadir)/bibus/bibus.cfg
 endef
 
 define install-doc-en
 	# copying docs in from Docs/html/en/ for bibus-doc-en
-	install -d $(datadir)/doc/bibus/html
-	cp -R Docs/html/ScreenShots $(datadir)/doc/bibus/html
-	cp -R Docs/html/en $(datadir)/doc/bibus/html
-	chmod -R 644 $(datadir)/doc/bibus/html/
-	chmod 755 $(datadir)/doc/bibus/html
-	chmod 755 $(datadir)/doc/bibus/html/ScreenShots
-	chmod 755 $(datadir)/doc/bibus/html/en
+	install -d $(datadir)/doc/${PF}/html
+	cp -R Docs/html/ScreenShots $(datadir)/doc/${PF}/html
+	cp -R Docs/html/en $(datadir)/doc/${PF}/html
+	chmod -R 644 $(datadir)/doc/${PF}/html/
+	chmod 755 $(datadir)/doc/${PF}/html
+	chmod 755 $(datadir)/doc/${PF}/html/ScreenShots
+	chmod 755 $(datadir)/doc/${PF}/html/en
 endef
 
 define compile
@@ -95,7 +95,7 @@
 		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+		echo "rm -rf $(datadir)/doc/${PF}" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
 		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
 	chmod 744 $(datadir)/bibus/Setup/uninstall.sh