diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index d997e8d49b1..dc399a73fba 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-21  Jakub Jelinek  <jakub@redhat.com>
+
+	* gcc_release (maybe_build_tarfile): Don't build a tarfile if
+	the first directory doesn't exist.
+
 2011-03-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* crontab: Enable 4.7 snapshots, switch 4.6 snapshots to
diff --git a/maintainer-scripts/gcc_release b/maintainer-scripts/gcc_release
index 0c40313f8b6..233c1590198 100755
--- a/maintainer-scripts/gcc_release
+++ b/maintainer-scripts/gcc_release
@@ -253,13 +253,7 @@ build_tarfile() {
 maybe_build_tarfile() {
   dest=$1
   shift
-  dir_exists=0
-  for maybe_dir in "$@"; do
-    if [ -d "$maybe_dir" ]; then
-      dir_exists=1
-    fi
-  done
-  if [ $dir_exists = 1 ]; then
+  if [ $# != 0 -a -d "$1" ]; then
     build_tarfile "$dest" "$@"
   else
     echo "Not building $dest tarfile"