diff --git a/.gitmodules b/.gitmodules
index b0586aacf..8d05e0725 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -12,3 +12,6 @@
 	path = thirdparty/python
 	url = https://github.com/austinsc/python.git
 	ignore = dirty
+[submodule "thirdparty/hiredis"]
+	path = thirdparty/hiredis
+	url = https://github.com/redis/hiredis.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 921befe2d..5ffc42cb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,7 @@ link_libraries(${CMAKE_SOURCE_DIR}/thirdparty/grpc/libs/opt/libgrpc++_unsecure.a
                ${CMAKE_SOURCE_DIR}/thirdparty/grpc/libs/opt/libgrpc++.a
                ${CMAKE_SOURCE_DIR}/thirdparty/grpc/libs/opt/libgrpc.a
                ${CMAKE_SOURCE_DIR}/thirdparty/grpc/libs/opt/protobuf/libprotobuf.a
+               ${CMAKE_SOURCE_DIR}/thirdparty/hiredis/libhiredis.a
                pthread)
 
 if(UNIX AND NOT APPLE)
diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh
index c20c5f410..d10180985 100755
--- a/thirdparty/build_thirdparty.sh
+++ b/thirdparty/build_thirdparty.sh
@@ -36,3 +36,7 @@ make VERBOSE=1 -j$PARALLEL
 echo "building GRPC"
 cd $TP_DIR/grpc
 make static HAS_SYSTEM_PROTOBUF=false HAS_SYSTEM_ZLIB=false HAS_SYSTEM_OPENSSL_ALPN=false HAS_SYSTEM_OPENSSL_NPN=false -j$PARALLEL
+
+echo "building hiredis"
+cd $TP_DIR/hiredis
+make
diff --git a/thirdparty/download_thirdparty.sh b/thirdparty/download_thirdparty.sh
index 0244777f0..4cfd55c6d 100755
--- a/thirdparty/download_thirdparty.sh
+++ b/thirdparty/download_thirdparty.sh
@@ -7,6 +7,7 @@ TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
 
 git submodule update --init --recursive -- "$TP_DIR/arrow"
 git submodule update --init --recursive -- "$TP_DIR/numbuf"
+git submodule update --init --recursive -- "$TP_DIR/hiredis"
 
 # this seems to be neeccessary for building on Mac OS X
 cd grpc
diff --git a/thirdparty/hiredis b/thirdparty/hiredis
new file mode 160000
index 000000000..5f98e1d35
--- /dev/null
+++ b/thirdparty/hiredis
@@ -0,0 +1 @@
+Subproject commit 5f98e1d35dcf00a026793ada2662f6e1ba77eb17