diff --git a/[refs] b/[refs]
index 47e68d0e102b..468359201d25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8723eaeff59a5146326288392f08be4c894fdad7
+refs/heads/master: 91d161857ce9672bd2a8cd99ff712a67186e2e76
diff --git a/trunk/scripts/package/buildtar b/trunk/scripts/package/buildtar
index b1fd48db1640..51b2aa0acb82 100644
--- a/trunk/scripts/package/buildtar
+++ b/trunk/scripts/package/buildtar
@@ -101,7 +101,11 @@ esac
 #
 (
 	cd "${tmpdir}"
-	tar cf - . | ${compress} > "${tarball}${file_ext}"
+	opts=
+	if tar --owner=root --group=root --help >/dev/null 2>&1; then
+		opts="--owner=root --group=root"
+	fi
+	tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
 )
 
 echo "Tarball successfully created in ${tarball}${file_ext}"