--- a/elektra-0.7.1-r2.ebuild	2012-11-06 20:31:02.000000000 +0100
+++ b/elektra-0.7.1-r3.ebuild	2013-03-23 22:05:37.573820189 +0100
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit autotools eutils
+inherit autotools eutils multilib
 
 DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
 HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
@@ -59,13 +59,15 @@
 
 	local my_f=""
 	#avoid collision with kerberos (bug 403025)
+	mkdir "${D}"/usr/include/elektra
 	for my_f in kdb kdbbackend.h kdbos.h kdbtools.h keyset kdb.h \
 		kdbloader.h kdbprivate.h key ; do
-		mv "${D}"/usr/include/{,elektra-}"${my_f}" || die
-		elog "/usr/include/${my_f} installed as elektra-${my_f}"
+		mv "${D}"/usr/include/{,elektra\/}"${my_f}" || die
+		elog "/usr/include/${my_f} installed as elektra/${my_f}"
 	done
-	sed -e '/^#include/s:kdbos.h:elektra-kdbos.h:' \
-		-i "${D}"/usr/include/elektra-kdb.h || die
+	#alter pc files
+	sed -e '/^includedir/s/$/\/elektra/' -i "${D}"/usr/$(get_libdir)/pkgconfig/elektra*.pc || die
+	sed -e '/^Cflags/s/$/\/elektra/' -i "${D}"/usr/$(get_libdir)/pkgconfig/elektra*.pc || die
 
 	#avoid collision with allegro (bug 409305)
 	for my_f in $(find "${D}"/usr/share/man/man3 -name "key.3*") ; do