diff --git a/.cvsignore b/.cvsignore
index 539dff11c2..c2cf20bbbc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ Makefile.*
 ffplay
 ffplay_g
 output_example
+qt-faststart
diff --git a/Makefile b/Makefile
index 4b92be4f30..d43de32ad5 100644
--- a/Makefile
+++ b/Makefile
@@ -172,7 +172,8 @@ clean: $(CLEANVHOOK)
 	$(MAKE) -C libavcodec clean
 	$(MAKE) -C libavformat clean
 	$(MAKE) -C tests clean
-	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) ffplay_g$(EXESUF) $(PROG) $(PROGTEST)
+	rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
+	   ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
 
 clean-vhook:
 	$(MAKE) -C vhook clean
diff --git a/doc/.cvsignore b/doc/.cvsignore
new file mode 100644
index 0000000000..39bd10002f
--- /dev/null
+++ b/doc/.cvsignore
@@ -0,0 +1,8 @@
+faq.html
+ffmpeg-doc.html
+ffmpeg.1
+ffplay-doc.html
+ffplay.1
+ffserver-doc.html
+ffserver.1
+hooks.html