diff --git a/srcpkgs/hal/libhal-devel.template b/srcpkgs/hal/libhal-devel.template
new file mode 100644
index 0000000000..48a981b843
--- /dev/null
+++ b/srcpkgs/hal/libhal-devel.template
@@ -0,0 +1,26 @@
+# Template file for 'libhal-devel'.
+#
+short_desc="Hardware Abstraction Layer - development files"
+long_desc="
+ ${long_desc}
+
+ This package contains files that are needed to build applications
+ that use libhal."
+
+Add_dependency run pkg-config
+Add_dependency run libblkid-devel
+Add_dependency run dbus-devel
+Add_dependency run dbus-glib-devel
+Add_dependency run expat-devel
+Add_dependency run glib-devel
+Add_dependency run pciutils-devel
+Add_dependency run ConsoleKit
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/{lib,share}
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
+}
diff --git a/srcpkgs/hal/libhal.template b/srcpkgs/hal/libhal.template
new file mode 100644
index 0000000000..296567e678
--- /dev/null
+++ b/srcpkgs/hal/libhal.template
@@ -0,0 +1,16 @@
+# Template file for 'libhal'.
+#
+short_desc="Hardware Abstraction Layer - shared libraries"
+long_desc="
+ ${long_desc}
+
+ This package contains shared libraries to be used by applications."
+
+Add_dependency run glibc
+Add_dependency run dbus-libs
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so.* ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/hal/template b/srcpkgs/hal/template
index e8469d5ec2..d4a6117778 100644
--- a/srcpkgs/hal/template
+++ b/srcpkgs/hal/template
@@ -1,7 +1,7 @@
 # Template file for 'hal'
 pkgname=hal
 version=0.5.14
-revision=1
+revision=2
 distfiles="http://hal.freedesktop.org/releases/hal-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-static=no --disable-console-kit
@@ -16,6 +16,7 @@ long_desc="
  HAL is daemon for collecting and maintaining information from several
  sources about the hardware on the system."
 
+subpackages="libhal libhal-devel"
 keep_empty_dirs=yes
 conf_files="
 /etc/dbus-1/system.d/hal.conf
@@ -35,13 +36,8 @@ Add_dependency run glib
 Add_dependency run pciutils
 Add_dependency run ConsoleKit-x11
 Add_dependency run dbus
-Add_dependency full udev
-Add_dependency full bash
-Add_dependency full hal-info
-Add_dependency full eject
-Add_dependency full usbutils
-Add_dependency full dmidecode
-Add_dependency full pm-utils
+Add_dependency run libhal
+
 Add_dependency build pkg-config
 Add_dependency build libblkid-devel
 Add_dependency build dbus-devel
@@ -51,6 +47,14 @@ Add_dependency build glib-devel
 Add_dependency build pciutils-devel
 Add_dependency build ConsoleKit
 
+Add_dependency full udev
+Add_dependency full bash
+Add_dependency full hal-info
+Add_dependency full eject
+Add_dependency full usbutils
+Add_dependency full dmidecode
+Add_dependency full pm-utils
+
 post_install()
 {
 	rm -rf ${DESTDIR}/var
diff --git a/srcpkgs/libhal b/srcpkgs/libhal
new file mode 120000
index 0000000000..6d42e8048b
--- /dev/null
+++ b/srcpkgs/libhal
@@ -0,0 +1 @@
+hal
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index c514a4a982..a09569d891 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -119,7 +119,6 @@ libxfcegui4.so			libxfcegui4		libxfcegui4-devel
 libxfce4kbd-private.so		libxfcegui4		libxfcegui4-devel
 libxfce4menu-0.1.so		libxfce4menu		libxfce4menu-devel
 libxfconf-0.so			xfconf			xfconf-devel
-libthunar-vfs-1.so		Thunar			Thunar-devel
 libxfce4util.so			libxfce4util		libxfce4util-devel
 libxfce4panel.so		xfce4-panel		xfce4-panel-devel
 libgstreamer-0.10.so		gstreamer		gstreamer-devel
@@ -222,8 +221,8 @@ libpolkit-gobject-1.so		polkit			polkit-devel
 libpolkit-agent-1.so		polkit			polkit-devel
 libpolkit-backend-1.so		polkit			polkit-devel
 libck-connector.so		ConsoleKit		ConsoleKit-devel
-libhal.so			hal
-libhal-storage.so		hal
+libhal.so			libhal			libhal-devel
+libhal-storage.so		libhal			libhal-devel
 libXt.so			libXt			libXt-devel
 libXtst.so			libXtst			libXtst-devel
 libxkbfile.so			libxkbfile		libxkbfile-devel
@@ -595,3 +594,5 @@ libgdu.so			gnome-disk-utility	gnome-disk-utility-devel
 libgdu-gtk.so			gnome-disk-utility	gnome-disk-utility-devel
 libcpufreq.so			libcpufreq		libcpufreq-devel
 libgucharmap.so			gucharmap		gucharmap-devel
+libgphoto2.so			libgphoto2		libgphoto2-devel
+libgphoto2_port.so		libgphoto2		libgphoto2-devel