--- a/octave-bug.in
+++ b/octave-bug.in
@@ -20,12 +20,24 @@
 F2C="%F2C%"
 F2CFLAGS="%F2CFLAGS%"
 CC="%CC%"
+CC_VERSION="%CC_VERSION%"
 CFLAGS="%CFLAGS%"
 CXX="%CXX%"
+CXX_VERSION="%CXX_VERSION%"
 CXXFLAGS="%CXXFLAGS%"
 LDFLAGS="%LDFLAGS%"
 DEFS="%DEFS%"
 
+CC_AND_VERSION=
+if test -n "$CC_VERSION"; then
+  CC_AND_VERSION="$CC, version $CC_VERSION"
+fi
+
+CXX_AND_VERSION=
+if test -n "$CXX_VERSION"; then
+  CXX_AND_VERSION="$CXX, version $CXX_VERSION"
+fi
+
 PATH=/bin:/usr/bin:/usr/ucb:/usr/local/bin:$PATH
 export PATH
 
@@ -110,9 +122,9 @@
 F2C:              $F2C
 F2CFLAGS:         $F2CFLAGS
 FLIBS:            $FLIBS
-C compiler:       $CC
+C compiler:       $CC_AND_VERSION
 CFLAGS:           $CFLAGS
-C++ compiler:     $CXX
+C++ compiler:     $CXX_AND_VERSION
 CXXFLAGS:         $CXXFLAGS
 LDFLAGS:          $LDFLAGS
 DEFS:
@@ -151,6 +163,9 @@
   then
     echo "file not changed -- no bug report submitted"
     status=1
+  elif test `wc $TEMP | awk '{print $1}'` -eq 0; then
+    echo "empty bug report file -- not submitted"
+    status=1
   else
 
 # Try to extract the recipient address, in case the To: line in the