diff --git a/import.log b/import.log
index 6a11ccc..b34d8b6 100644
--- a/import.log
+++ b/import.log
@@ -1 +1,2 @@
 puppet-0_24_7-1_fc10:HEAD:puppet-0.24.7-1.fc10.src.rpm:1229416939
+puppet-0_24_7-3_fc10:HEAD:puppet-0.24.7-3.fc10.src.rpm:1229418101
diff --git a/puppet.spec b/puppet.spec
index 4fd015d..5d95fdd 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -3,11 +3,13 @@
 
 Name:           puppet
 Version:        0.24.7
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A network tool for managing many disparate systems
 License:        GPLv2+
 URL:            http://puppet.reductivelabs.com/
 Source0:        http://reductivelabs.com/downloads/puppet/%{name}-%{version}.tgz
+Group:          System Environment/Base
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ruby >= 1.8.1
@@ -25,6 +27,7 @@ Requires:       libselinux-ruby
 
 Requires:       facter >= 1.1.4
 Requires:       ruby >= 1.8.1
+Requires:       ruby-augeas
 Requires(pre):  shadow-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -147,9 +150,12 @@ touch %{buildroot}%{_sysconfdir}/puppet/puppetd.conf
 %doc %{_mandir}/man8/puppetmasterd.8.gz
 %doc %{_mandir}/man8/puppetrun.8.gz
 
+# Fixed uid/gid were assigned in bz 472073 (Fedora), 471918 (RHEL-5),
+# and 471919 (RHEL-4)
 %pre
-getent group puppet >/dev/null || groupadd -r puppet
+getent group puppet >/dev/null || groupadd -r puppet -g 52
 getent passwd puppet >/dev/null || \
+useradd -r -u 52 -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
 useradd -r -g puppet -d %{_localstatedir}/lib/puppet -s /sbin/nologin \
     -c "Puppet" puppet || :
 # ensure that old setups have the right puppet home dir
@@ -189,8 +195,11 @@ fi
 rm -rf %{buildroot}
 
 %changelog
-* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 0.24.7-1
+* Tue Dec 16 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 0.24.7-3
 - New upstream version
+- Set a static uid and gid (#472073, #471918, #471919)
+- Add a conditional requirement on libselinux-ruby for Fedora >= 9
+- Add a dependency on ruby-augeas
 
 * Wed Oct 22 2008 Todd Zullinger <tmz@pobox.com> - 0.24.6-1
 - Update to 0.24.6