diff --git a/ChangeLog b/ChangeLog
index c9136431a..d7066a53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-24  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+	* autogen.sh (mscripts): only execute render-bugs if it exists.
+
 2006-12-23  Kevin Ryde  <user42@zip.com.au>
 
 	* configure.in (-lm): No need to suppress libm on mingw, it's not
diff --git a/autogen.sh b/autogen.sh
index 90dc4805f..18e639b8c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,8 +31,10 @@ ln -s $workbook/build/dist-files/.gdbinit examples/example.gdbinit
 
 # TODO: This should be moved to dist-guile
 mscripts=../guile-scripts
-rm -f BUGS
-$mscripts/render-bugs > BUGS
+if test -x $mscripts/render-bugs ; then
+  rm -f BUGS
+  $mscripts/render-bugs > BUGS
+fi
 
 ######################################################################
 ### update infrastructure