diff --git a/.gitmodules b/.gitmodules
index 8e357d5..c99e698 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "drltrace_src/dynamorio"]
 	path = drltrace_src/dynamorio
-	url = git://github.com/DynamoRIO/dynamorio.git
+	url = https://github.com/DynamoRIO/dynamorio.git
diff --git a/drltrace_src/drltrace.cpp b/drltrace_src/drltrace.cpp
index d8959c0..0b9f447 100644
--- a/drltrace_src/drltrace.cpp
+++ b/drltrace_src/drltrace.cpp
@@ -237,7 +237,7 @@ print_symbolic_args(const char *name, void *wrapcxt, app_pc func)
  */
 
 static void
-lib_entry(void *wrapcxt, INOUT void **user_data)
+lib_entry(void *wrapcxt, DR_PARAM_INOUT void **user_data)
 {
     const char *name = (const char *) *user_data;
     const char *modname = NULL;
diff --git a/drltrace_src/drltrace_options.h b/drltrace_src/drltrace_options.h
index 619052f..6acacb6 100644
--- a/drltrace_src/drltrace_options.h
+++ b/drltrace_src/drltrace_options.h
@@ -32,6 +32,8 @@
 
 #include "droption.h"
 
+using namespace dynamorio::droption;
+
 extern droption_t<std::string> op_logdir;
 extern droption_t<bool> op_only_from_app;
 extern droption_t<bool> op_follow_children;
diff --git a/drltrace_src/dynamorio b/drltrace_src/dynamorio
index 96a23da..94f5c44 160000
--- a/drltrace_src/dynamorio
+++ b/drltrace_src/dynamorio
@@ -1 +1 @@
-Subproject commit 96a23da076a19a330a63f8b281fb2104ec52ab80
+Subproject commit 94f5c444fdef07823f0d71796878ea0ff4767f30