diff --git a/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch b/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
new file mode 100644
index 0000000..1d5550d
--- /dev/null
+++ b/0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
@@ -0,0 +1,26 @@
+From e8633211edb36d633864a6ee82ad4655984fa732 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger <tmz@pobox.com>
+Date: Sun, 4 Jan 2009 21:32:14 -0500
+Subject: [PATCH] Use /var/run/hald as mount dir for hal callout
+
+This is preferred over /tmp by SELinux.
+---
+ tools/hal-callout.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/tools/hal-callout.c b/tools/hal-callout.c
+index e7313fe..4d6044b 100644
+--- a/tools/hal-callout.c
++++ b/tools/hal-callout.c
+@@ -52,7 +52,7 @@ static char *mount_ipod (const char *dev_path)
+         if (fstype == NULL) {
+                 return NULL;
+         }
+-        filename = g_build_filename (g_get_tmp_dir (), "ipodXXXXXX", NULL);
++        filename = g_build_filename ("/var/run/hald", "ipodXXXXXX", NULL);
+         if (filename == NULL) {
+                 return NULL;
+         }
+-- 
+1.6.1
+
diff --git a/libgpod.spec b/libgpod.spec
index 5d6ec26..f4cbc2c 100644
--- a/libgpod.spec
+++ b/libgpod.spec
@@ -3,7 +3,7 @@
 Summary: Library to access the contents of an iPod
 Name: libgpod
 Version: 0.6.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtkpod.org/libgpod.html
@@ -12,6 +12,8 @@ Patch0: libgpod-0.6.0-photoremove.patch
 Patch1: libgpod-0.6.0-ipod-touch-typos.patch
 Patch2: libgpod-0.6.0-spl-tracklen.patch
 Patch3: libgpod-0.6.0-sg3_utils-1.26.patch
+# See http://www.redhat.com/archives/fedora-selinux-list/2009-January/msg00005.html
+Patch4: 0001-Use-var-run-hald-as-mount-dir-for-hal-callout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: docbook-style-xsl
 BuildRequires: glib2-devel
@@ -25,6 +27,7 @@ Buildrequires: python-devel
 Buildrequires: python-mutagen
 Buildrequires: sg3_utils-devel
 Buildrequires: swig
+Requires: hal
 
 %description
 Libgpod is a library to access the contents of an iPod. It supports playlists,
@@ -51,6 +54,7 @@ libgpod.
 Summary: API documentation for the libgpod library
 Group: Documentation
 License: GFDL
+Requires: %{name} = %{version}-%{release}
 Requires: gtk-doc
 
 %description doc
@@ -77,13 +81,14 @@ libgpod library.
 %patch1 -p0 -b .ipod-touch-typos
 %patch2 -p0 -b .spl-tracklen
 %patch3 -p1 -b .sg3_utils
+%patch4 -p1 -b .selinux
 
 # remove execute perms on the python examples as they'll be installed in %doc
 %{__chmod} -x bindings/python/examples/*.py
 
 
 %build
-%configure
+%configure --with-hal-callouts-dir=%{_libdir}/hal/scripts
 %{__make} %{?_smp_mflags}
 
 # add gdk-pixbuf-2.0 to the pkg-config file requirements
@@ -112,7 +117,7 @@ libgpod library.
 %doc AUTHORS ChangeLog COPYING NEWS README*
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_libdir}/hal/*
+%{_libdir}/hal/scripts/*
 %{_datadir}/hal/fdi/policy/20thirdparty/*.fdi
 
 
@@ -139,6 +144,13 @@ libgpod library.
 
 
 %changelog
+* Wed Jan 14 2009 Todd Zullinger <tmz@pobox.com> - 0.6.0-10
+- Fix path to hal callout (this should help setup the SysInfoExtended
+  file automagically)
+- Use /var/run/hald as mount dir for hal callout
+- Require hal
+- Require main package for the -doc subpackage
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.6.0-9
 - Rebuild for Python 2.6