diff --git a/macros.in b/macros.in
index 180a0fdfb..bed8bcb16 100644
--- a/macros.in
+++ b/macros.in
@@ -1,4 +1,4 @@
-# $Id: macros.in,v 1.19 1999/03/28 00:47:43 jbj Exp $
+# $Id: macros.in,v 1.20 1999/03/30 19:34:01 jbj Exp $
 #==============================================================================
 # Macro naming conventions (preliminary):
 #
@@ -56,8 +56,8 @@
 %_defaultdocdir		%{_usr}/doc
 #
 # XXX fixowner, fixgroup, and fixperms are run at the end of hardcoded setup
-#%_fixowner		chown -R root
-#%_fixgroup		chgrp -R @ROOT_GROUP@
+%_fixowner		[ `id -u` = '0' ] && chown -R root
+%_fixgroup		[ `id -u` = '0' ] && chgrp -R @ROOT_GROUP@
 %_fixperms		chmod -R @FIXPERMS@
 #
 %_gzipbin		@GZIPBIN@
diff --git a/po/rpm.pot b/po/rpm.pot
index 296d28dfc..3da8ad9a1 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-27 18:14-0500\n"
+"POT-Creation-Date: 1999-03-30 12:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3049,12 +3049,12 @@ msgstr ""
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:1122
+#: ../lib/rpmrc.c:1105
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: ../lib/rpmrc.c:1123
+#: ../lib/rpmrc.c:1106
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
diff --git a/rpm.spec b/rpm.spec
index 5076858cb..212585973 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 2.93
 Version: %{version}
-Release: 6
+Release: 7
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/rpm-%{version}.tar.gz
 Copyright: GPL