diff --git a/.gitmodules b/.gitmodules
index 0929c8ec33cb2..f943b103166c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,10 @@
 	path = third_party/protobuf
 	url = https://github.com/google/protobuf.git
 	branch = v3.0.0-alpha-1
-[submodule "third_party/libevent"]
-	path = third_party/libevent
+[submodule "third_party/event2"]
+	path = third_party/event2
 	url = https://github.com/libevent/libevent.git
 	branch = patches-2.0
+[submodule "third_party/gflags"]
+	path = third_party/gflags
+	url = https://code.google.com/p/gflags
diff --git a/third_party/libevent b/third_party/event2
similarity index 100%
rename from third_party/libevent
rename to third_party/event2
diff --git a/third_party/gflags b/third_party/gflags
new file mode 160000
index 0000000000000..05b155ff59114
--- /dev/null
+++ b/third_party/gflags
@@ -0,0 +1 @@
+Subproject commit 05b155ff59114735ec8cd089f669c4c3d8f59029