diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec
index ba074c2..ac976a7 100644
--- a/gnome-vfs2.spec
+++ b/gnome-vfs2.spec
@@ -1,9 +1,16 @@
 %define po_package gnome-vfs-2.0
 
+# don't use HAL from F-16 on
+%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
+%bcond_with hal
+%else
+%bcond_without hal
+%endif
+
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.24.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ and GPLv2+
 # the daemon and the library are LGPLv2+
 # the modules are LGPLv2+ and GPLv2+
@@ -29,7 +36,9 @@ BuildRequires: libsmbclient-devel
 BuildRequires: openssl-devel gamin-devel
 BuildRequires: krb5-devel
 BuildRequires: avahi-glib-devel 
-BuildRequires: hal-devel 
+%if %{with hal}
+BuildRequires: hal-devel
+%endif
 BuildRequires: dbus-devel 
 BuildRequires: dbus-glib-devel 
 BuildRequires: gettext
@@ -132,7 +141,12 @@ if pkg-config openssl ; then
 	LDFLAGS=`pkg-config --libs-only-L openssl`; export LDFLAGS
 fi
 
-%configure --disable-gtk-doc --enable-hal --disable-static
+%configure \
+    --disable-gtk-doc \
+%if %{with hal}
+    --enable-hal \
+%endif
+    --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -205,6 +219,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Thu Apr 21 2011 Nils Philippsen <nils@redhat.com> - 2.24.4-6
+- build without HAL from F-16/EL-7 on
+
 * Tue Apr 12 2011 Christopher Aillon <caillon@redhat.com> - 2.24.4-5
 - Change the default http,https handler to gvfs-open