diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index 74f4677..3f0116d 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -4,7 +4,7 @@
 
 Name:    zeroinstall-injector
 Version: 0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: The Zero Install Injector (0launch)
 
 Group:   Applications/System
@@ -16,8 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 BuildRequires: python-devel gnupg desktop-file-utils
-Requires: PyXML pygtk2 gnupg pygtk2-libglade sudo
-Requires: /usr/sbin/useradd
+Requires:      PyXML pygtk2 gnupg pygtk2-libglade sudo
+Requires(pre): shadow-utils
 
 %description
 The Zero Install Injector makes it easy for users to install software without
@@ -64,8 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 # Add the "zeroinst" user.
 # This is not used by default, but is required if you want to
 # set up sharing of downloads later.
-/usr/sbin/useradd -c 'Zero Install shared cache' \
-    -s /sbin/nologin -r -d '/' zeroinst 2> /dev/null || :
+getent group  zeroinst >/dev/null || groupadd -r zeroinst
+getent passwd zeroinst >/dev/null || \
+useradd -r -g -d %{cache_dir} -s /sbin/nologin \
+    -c "Zero Install shared cache" zeroinst
+exit 0
 
 %files
 %defattr(-,root,root,-)
@@ -88,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,zeroinst,zeroinst) %{cache_dir}/implementations
 
 %changelog
+* Sat Sep  8 2007 Michel Salim <michel.sylvan@gmail.com> 0.30-2
+- Update scriptlet that creates zeroinst user
+
 * Wed Sep  5 2007 Michel Salim <michel.sylvan@gmail.com> 0.30-1
 - Update to 0.30
 - License is now versioned