diff --git a/Makefile.am b/Makefile.am
index fbc96e64..53eb43c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = shared src clients wcap-decode data protocol tests
+SUBDIRS = shared src clients wcap data protocol tests
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-setuid-install
diff --git a/configure.ac b/configure.ac
index 19bceefc..d65848ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ AC_CONFIG_FILES([Makefile
 		 src/Makefile
 		 src/xwayland/Makefile
 		 clients/Makefile
-		 wcap-decode/Makefile
+		 wcap/Makefile
 		 data/Makefile
 		 protocol/Makefile
 		 tests/Makefile])
diff --git a/src/screenshooter.c b/src/screenshooter.c
index e3e8779c..da06ae3a 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -31,7 +31,7 @@
 #include "compositor.h"
 #include "screenshooter-server-protocol.h"
 
-#include "../wcap-decode/wcap-decode.h"
+#include "../wcap/wcap-decode.h"
 
 struct screenshooter {
 	struct wl_object base;
diff --git a/wcap-decode/COPYING b/wcap/COPYING
similarity index 100%
rename from wcap-decode/COPYING
rename to wcap/COPYING
diff --git a/wcap-decode/EbmlIDs.h b/wcap/EbmlIDs.h
similarity index 100%
rename from wcap-decode/EbmlIDs.h
rename to wcap/EbmlIDs.h
diff --git a/wcap-decode/EbmlWriter.c b/wcap/EbmlWriter.c
similarity index 100%
rename from wcap-decode/EbmlWriter.c
rename to wcap/EbmlWriter.c
diff --git a/wcap-decode/EbmlWriter.h b/wcap/EbmlWriter.h
similarity index 100%
rename from wcap-decode/EbmlWriter.h
rename to wcap/EbmlWriter.h
diff --git a/wcap-decode/args.c b/wcap/args.c
similarity index 100%
rename from wcap-decode/args.c
rename to wcap/args.c
diff --git a/wcap-decode/args.h b/wcap/args.h
similarity index 100%
rename from wcap-decode/args.h
rename to wcap/args.h
diff --git a/wcap-decode/mem_ops.h b/wcap/mem_ops.h
similarity index 100%
rename from wcap-decode/mem_ops.h
rename to wcap/mem_ops.h
diff --git a/wcap-decode/mem_ops_aligned.h b/wcap/mem_ops_aligned.h
similarity index 100%
rename from wcap-decode/mem_ops_aligned.h
rename to wcap/mem_ops_aligned.h
diff --git a/wcap-decode/tools_common.c b/wcap/tools_common.c
similarity index 100%
rename from wcap-decode/tools_common.c
rename to wcap/tools_common.c
diff --git a/wcap-decode/tools_common.h b/wcap/tools_common.h
similarity index 100%
rename from wcap-decode/tools_common.h
rename to wcap/tools_common.h
diff --git a/wcap-decode/vpx_config.h b/wcap/vpx_config.h
similarity index 100%
rename from wcap-decode/vpx_config.h
rename to wcap/vpx_config.h
diff --git a/wcap-decode/vpx_timer.h b/wcap/vpx_timer.h
similarity index 100%
rename from wcap-decode/vpx_timer.h
rename to wcap/vpx_timer.h
diff --git a/wcap-decode/vpxenc.c b/wcap/vpxenc.c
similarity index 100%
rename from wcap-decode/vpxenc.c
rename to wcap/vpxenc.c
diff --git a/wcap-decode/wcap-decode.c b/wcap/wcap-decode.c
similarity index 100%
rename from wcap-decode/wcap-decode.c
rename to wcap/wcap-decode.c
diff --git a/wcap-decode/wcap-decode.h b/wcap/wcap-decode.h
similarity index 100%
rename from wcap-decode/wcap-decode.h
rename to wcap/wcap-decode.h
diff --git a/wcap-decode/y4minput.c b/wcap/y4minput.c
similarity index 100%
rename from wcap-decode/y4minput.c
rename to wcap/y4minput.c
diff --git a/wcap-decode/y4minput.h b/wcap/y4minput.h
similarity index 100%
rename from wcap-decode/y4minput.h
rename to wcap/y4minput.h