diff --git a/libvirt.spec.in b/libvirt.spec.in
index 19f91d71a8..25e521c6b0 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -894,10 +894,14 @@ done
 %endif
 
 %if %{with_cgconfig}
+# Starting with Fedora 15, systemd automounts all cgroups, and cgconfig is
+# no longer a necessary service.
+%if 0%{?fedora} <= 14 || 0%{?rhel} <= 6
 if [ "$1" -eq "1" ]; then
 /sbin/chkconfig cgconfig on
 fi
 %endif
+%endif
 
 /sbin/chkconfig --add libvirtd
 if [ "$1" -ge "1" ]; then
@@ -926,7 +930,8 @@ fi
 /sbin/chkconfig --add libvirt-guests
 if [ $1 -ge 1 ]; then
     level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2)
-    if /sbin/chkconfig --list libvirt-guests | /bin/grep -q $level:on ; then
+    if /sbin/chkconfig --list libvirt-guests 2>/dev/null \
+        | /bin/grep -q $level:on ; then
         # this doesn't do anything but allowing for libvirt-guests to be
         # stopped on the first shutdown
         /sbin/service libvirt-guests start > /dev/null 2>&1 || true