diff --git a/srcpkgs/libbonobo-devel b/srcpkgs/libbonobo-devel
new file mode 120000
index 0000000000..e48a871495
--- /dev/null
+++ b/srcpkgs/libbonobo-devel
@@ -0,0 +1 @@
+libbonobo
\ No newline at end of file
diff --git a/srcpkgs/libbonobo/depends b/srcpkgs/libbonobo/depends
new file mode 100644
index 0000000000..071d27b792
--- /dev/null
+++ b/srcpkgs/libbonobo/depends
@@ -0,0 +1,2 @@
+abi_depends=">=2.30.0"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/libbonobo/files/bonobo-activation-config.xml b/srcpkgs/libbonobo/files/bonobo-activation-config.xml
new file mode 100644
index 0000000000..2d046b1af1
--- /dev/null
+++ b/srcpkgs/libbonobo/files/bonobo-activation-config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<oafconfig>
+
+<searchpath>
+    <item>/usr/lib/bonobo/servers</item>
+    <!-- Examples: -->
+    <!-- <item>/opt/gnome2/lib/bonobo/servers</item> -->
+    <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> -->
+    <!-- <item>/usr/local/lib/bonobo/servers</item> -->
+    <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> -->
+</searchpath>
+
+</oafconfig>
diff --git a/srcpkgs/libbonobo/libbonobo-devel.template b/srcpkgs/libbonobo/libbonobo-devel.template
new file mode 100644
index 0000000000..6b30efe029
--- /dev/null
+++ b/srcpkgs/libbonobo/libbonobo-devel.template
@@ -0,0 +1,15 @@
+# Template file for 'libbonobo-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/{gtk-doc,idl} ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/libbonobo/template b/srcpkgs/libbonobo/template
new file mode 100644
index 0000000000..887e429995
--- /dev/null
+++ b/srcpkgs/libbonobo/template
@@ -0,0 +1,43 @@
+# Template file for 'libbonobo'
+pkgname=libbonobo
+version=2.24.3
+distfiles="${GNOME_SITE}/$pkgname/2.24/$pkgname-$version.tar.bz2"
+build_style=gnu_configure
+configure_args="--disable-static --localstatedir=/var"
+short_desc="GNOME Object activation framework library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe
+long_desc="
+ Bonobo is a set of language and system independent CORBA interfaces
+ for creating reusable components, controls and creating compound
+ documents.
+
+ We distinguish between 'Bonobo' the name of the component architecture,
+ and 'bonobo' which is the C-based easy to use implementation of the
+ Bonobo component architecture.
+
+ libbonobo contains a rich API for dealing Bonobo Objects (activation
+ for example)."
+
+conf_files="/etc/bonobo-activation/bonobo-activation-config.xml" 
+subpackages="$pkgname-devel"
+
+Add_dependency run glibc
+Add_dependency run ORBit2
+Add_dependency run glib
+Add_dependency run dbus-glib
+Add_dependency run dbus-libs
+Add_dependency run libxml2
+Add_dependency build pkg-config
+Add_dependency build intltool
+Add_dependency build ORBit2-devel
+Add_dependency build glib-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build dbus-devel
+Add_dependency build libxml2-devel
+
+post_install()
+{
+	rm -f ${DESTDIR}/etc/${conf_files}
+	install -m644 ${FILESDIR}/*.xml ${DESTDIR}/etc/bonobo-activation
+}
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index a351d012d1..23c67f001b 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -455,7 +455,6 @@ libicuuc.so.42			icu-libs		icu-devel
 libaspell.so.15			aspell			aspell-devel
 libhunspell-1.2.so		hunspell		hunspell-devel
 libenchant.so			enchant			enchant-devel
-libORBit-2.so			ORBit2			ORBit2-devel
 libgconf-2.so			GConf			GConf-devel
 libsoup-2.4.so			libsoup			libsoup-devel
 libunique-1.0.so		libunique		libunique-devel
@@ -524,3 +523,8 @@ libgtop-2.0.so			libgtop			libgtop-devel
 librarian.so			rarian			rarian-devel
 libgnome-desktop-2.so.17	gnome-desktop		gnome-desktop-devel
 libmetacity-private.so		metacity		metacity-devel
+libbonobo-2.so.0		libbonobo		libbonobo-devel
+libbonobo-activation.so		libbonobo		libbonobo-devel
+libORBitCosNaming-2.so		ORBit2			ORBit2-devel
+libORBit-imodule-2.so		ORBit2			ORBit2-devel
+libORBit-2.so			ORBit2			ORBit2-devel