diff --git a/Makefile b/Makefile
index caeb56e62e..a057ecf9e5 100644
--- a/Makefile
+++ b/Makefile
@@ -102,10 +102,10 @@ version.h:
 output_example$(EXESUF): output_example.o .libs
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(EXTRALIBS)
 
-qt-faststart$(EXESUF): qt-faststart.c
+tools/qt-faststart$(EXESUF): qt-faststart.c
 	$(CC) $(CFLAGS) $< -o $@
 
-cws2fws$(EXESUF): cws2fws.c
+tools/cws2fws$(EXESUF): cws2fws.c
 	$(CC) $(CFLAGS) $< -o $@ -lz
 
 ffplay.o: CFLAGS += $(SDL_CFLAGS)
diff --git a/configure b/configure
index 67775a8b31..a7a57d198b 100755
--- a/configure
+++ b/configure
@@ -1994,6 +1994,7 @@ if enabled source_path_used; then
          libavutil \
          libswscale \
          tests \
+         tools \
          vhook \
          "
     FILES="\
diff --git a/build_avopt b/tools/build_avopt
similarity index 100%
rename from build_avopt
rename to tools/build_avopt
diff --git a/clean-diff b/tools/clean-diff
similarity index 100%
rename from clean-diff
rename to tools/clean-diff
diff --git a/cws2fws.c b/tools/cws2fws.c
similarity index 100%
rename from cws2fws.c
rename to tools/cws2fws.c
diff --git a/pktdumper.c b/tools/pktdumper.c
similarity index 100%
rename from pktdumper.c
rename to tools/pktdumper.c
diff --git a/qt-faststart.c b/tools/qt-faststart.c
similarity index 100%
rename from qt-faststart.c
rename to tools/qt-faststart.c
diff --git a/unwrap-diff b/tools/unwrap-diff
similarity index 100%
rename from unwrap-diff
rename to tools/unwrap-diff