diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 30352b501e2..49e4c889bc9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-07  Andreas Schwab  <schwab@suse.de>
+
+	* observer.sh: Use different temporary file name depending on mode
+	of operation to avoid clash during parallel build.
+
 2005-07-06  Bob Rossi  <bob@brasko.net>
 
 	* fork-child.c (fork-inferior): Use accessor function for
diff --git a/gdb/observer.sh b/gdb/observer.sh
index 4c235ea183e..af699651d94 100755
--- a/gdb/observer.sh
+++ b/gdb/observer.sh
@@ -9,7 +9,11 @@ fi
 lang=$1 ; shift
 texi=$1 ; shift
 o=$1
-otmp="`echo $1 | sed -e 's,\.[^.]*$,,'`.tmp"; shift
+case $lang in
+  h) tmp=htmp ;;
+  inc) tmp=itmp ;;
+esac
+otmp="`echo $1 | sed -e 's,\.[^.]*$,,'`.$tmp"; shift
 echo "Creating ${otmp}" 1>&2
 rm -f ${otmp}