diff --git a/tools/Makefile.in b/tools/Makefile.in
index 33e5c258..156a2eb3 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -51,7 +51,7 @@ install: all
 	if ! test -f $(sysconfdir)/bird@SUFFIX6@.conf ; then						\
 		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(sysconfdir)/bird@SUFFIX6@.conf ;	\
 	else											\
-		echo "Not overwriting old bird.conf" ;						\
+		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
 	fi
 
 install-docs:
@@ -60,7 +60,7 @@ install-docs:
 
 clean:
 	find . -name "*.[oa]" -o -name core -o -name depend -o -name "*.html" | xargs rm -f
-	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl .dep-stamp
+	rm -f $(exedir)/bird $(exedir)/birdc $(exedir)/bird.ctl $(exedir)/bird6.ctl .dep-stamp
 
 distclean: clean
 	rm -f config.* configure sysdep/autoconf.h sysdep/paths.h Makefile Rules