diff --git a/Makefile b/Makefile
index c0aa3ff103..08dd4a3850 100644
--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@ obj/upb/pb/compile_decoder_x64.lo : CSTD = -std=gnu89
 
 upb/pb/compile_decoder_x64.h: upb/pb/compile_decoder_x64.dasc
 	$(E) DYNASM $<
-	$(Q) $(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false)
+	$(Q) $(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false)
 endif
 
 upb_json_SRCS = \
@@ -256,7 +256,7 @@ upb/descriptor/descriptor.pb: upb/descriptor/descriptor.proto
 
 genfiles: upb/descriptor/descriptor.pb tools/upbc
 	./tools/upbc upb/descriptor/descriptor.pb upb/descriptor/descriptor google_protobuf_descriptor
-	$(LUA) dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false)
+	$(LUA) third_party/dynasm/dynasm.lua -c upb/pb/compile_decoder_x64.dasc > upb/pb/compile_decoder_x64.h || (rm upb/pb/compile_decoder_x64.h ; false)
 
 # upbc depends on these Lua extensions.
 UPBC_LUA_EXTS = \
diff --git a/dynasm/COPYRIGHT b/third_party/dynasm/LICENSE
similarity index 100%
rename from dynasm/COPYRIGHT
rename to third_party/dynasm/LICENSE
diff --git a/third_party/dynasm/README.google b/third_party/dynasm/README.google
new file mode 100644
index 0000000000..dd829a0534
--- /dev/null
+++ b/third_party/dynasm/README.google
@@ -0,0 +1,10 @@
+URL: http://repo.or.cz/w/luajit-2.0.git/tree/6c05739684527919293e25668589f17c35a7c129:/dynasm
+Version: 6c05739684527919293e25668589f17c35a7c129
+License: MIT
+License File: LICENSE
+Description:
+Taken from the larger LuaJIT project, DynASM is a tiny preprocessor and
+runtime for generating machine code at runtime.
+
+Local Modifications:
+No modifications.
diff --git a/dynasm/dasm_arm.h b/third_party/dynasm/dasm_arm.h
similarity index 100%
rename from dynasm/dasm_arm.h
rename to third_party/dynasm/dasm_arm.h
diff --git a/dynasm/dasm_arm.lua b/third_party/dynasm/dasm_arm.lua
similarity index 100%
rename from dynasm/dasm_arm.lua
rename to third_party/dynasm/dasm_arm.lua
diff --git a/dynasm/dasm_mips.h b/third_party/dynasm/dasm_mips.h
similarity index 100%
rename from dynasm/dasm_mips.h
rename to third_party/dynasm/dasm_mips.h
diff --git a/dynasm/dasm_mips.lua b/third_party/dynasm/dasm_mips.lua
similarity index 100%
rename from dynasm/dasm_mips.lua
rename to third_party/dynasm/dasm_mips.lua
diff --git a/dynasm/dasm_ppc.h b/third_party/dynasm/dasm_ppc.h
similarity index 100%
rename from dynasm/dasm_ppc.h
rename to third_party/dynasm/dasm_ppc.h
diff --git a/dynasm/dasm_ppc.lua b/third_party/dynasm/dasm_ppc.lua
similarity index 100%
rename from dynasm/dasm_ppc.lua
rename to third_party/dynasm/dasm_ppc.lua
diff --git a/dynasm/dasm_proto.h b/third_party/dynasm/dasm_proto.h
similarity index 100%
rename from dynasm/dasm_proto.h
rename to third_party/dynasm/dasm_proto.h
diff --git a/dynasm/dasm_x64.lua b/third_party/dynasm/dasm_x64.lua
similarity index 100%
rename from dynasm/dasm_x64.lua
rename to third_party/dynasm/dasm_x64.lua
diff --git a/dynasm/dasm_x86.h b/third_party/dynasm/dasm_x86.h
similarity index 100%
rename from dynasm/dasm_x86.h
rename to third_party/dynasm/dasm_x86.h
diff --git a/dynasm/dasm_x86.lua b/third_party/dynasm/dasm_x86.lua
similarity index 100%
rename from dynasm/dasm_x86.lua
rename to third_party/dynasm/dasm_x86.lua
diff --git a/dynasm/dynasm.lua b/third_party/dynasm/dynasm.lua
similarity index 100%
rename from dynasm/dynasm.lua
rename to third_party/dynasm/dynasm.lua
diff --git a/upb/pb/compile_decoder_x64.c b/upb/pb/compile_decoder_x64.c
index 3ce11e491c..9b78c65676 100644
--- a/upb/pb/compile_decoder_x64.c
+++ b/upb/pb/compile_decoder_x64.c
@@ -129,8 +129,8 @@ static char *upb_vasprintf(const char *fmt, va_list ap);
 static char *upb_asprintf(const char *fmt, ...);
 #endif
 
-#include "dynasm/dasm_proto.h"
-#include "dynasm/dasm_x86.h"
+#include "third_party/dynasm/dasm_proto.h"
+#include "third_party/dynasm/dasm_x86.h"
 #include "upb/pb/compile_decoder_x64.h"
 
 static jitcompiler *newjitcompiler(mgroup *group) {