diff --git a/gdb2fail.sh b/gdb2fail.sh
index a012228..893c6b9 100755
--- a/gdb2fail.sh
+++ b/gdb2fail.sh
@@ -30,12 +30,20 @@ do
     if test -z "$isa" ; then
     isa=`echo "$f" | sed -n -e 's,^.*/scratch/.*/task_\([0-9]*\)/logs/\([^/]*\)/.*$,-\2,p'`
     fi
+    if test -z "$ver" ; then
+    ver=`echo "$f" | sed -n -e 's,^.*/work/tasks/\([0-9]*\)/.*$,-\1,p'`
+    fi
     # begin 644 gdb-i386-redhat-linux-gnu.tar.bz2
-    line="gdb${ver}${rel}${isa}"
-###    echo "$line"
     for t in sum log ; do
+	if test -z "$isa" ; then
+		isa=`uudecode < "$f" -o /dev/stdout | bunzip2 \
+		| tar -t -f - "gdb-*-redhat-linux-gnu.$t" 2>&1 \
+		| sed -n 's/^gdb-\(.*\)-redhat-linux-gnu[.].*$/-\1/p' \
+		`
+	fi
+	line="gdb${ver}${rel}${isa}"
 	uudecode < "$f" -o /dev/stdout | bunzip2 \
-	    | tar -xpvO -f - "gdb-*-redhat-linux-gnu.$t" \
+	    | tar -xpvvO -f - "gdb-*-redhat-linux-gnu.$t" \
 	    > "tests/$line.$t"
     done
 done