diff --git a/Changelog b/Changelog
index 24363a80..f8458d1d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Fri Nov 30 2007 Jesse Keating <jkeating@redhat.com>
+- Only check for root if you're doing root level tasks (buildinstall)
+
 * Thu Nov 29 2007 Jesse Keating <jkeating@redhat.com>
 - Add a split option to the doCreateIsos call
 
diff --git a/pungi b/pungi
index eba64671..a4677cde 100755
--- a/pungi
+++ b/pungi
@@ -22,8 +22,8 @@ import pykickstart.version
 
 def main():
 
-    # You must be this high to ride.
-    if os.geteuid () != 0:
+    # You must be this high to ride if you're going to do root tasks
+    if os.geteuid () != 0 and (opts.do_all or opts.do_buildinstall):
         print >> sys.stderr, "You must run pungi as root"
         return 1