diff --git a/deps/libgit2.mk b/deps/libgit2.mk
index 7a0aecd2dc7bd1..2283912f0c638b 100644
--- a/deps/libgit2.mk
+++ b/deps/libgit2.mk
@@ -20,10 +20,10 @@ LIBGIT2_OPTS += -DBUILD_CLAR=OFF -DDLLTOOL=`which $(CROSS_COMPILE)dlltool`
 LIBGIT2_OPTS += -DCMAKE_FIND_ROOT_PATH=/usr/$(XC_HOST) -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
 endif
 else
-LIBGIT2_OPTS += -DUSE_OPENSSL=OFF -DUSE_CUSTOM_TLS=ON -DCMAKE_INSTALL_RPATH=$(build_prefix) -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
+LIBGIT2_OPTS += -DUSE_OPENSSL=OFF -DCMAKE_INSTALL_RPATH=$(build_prefix) -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
 endif
 
-$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/CMakeLists.txt
+$(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/CMakeLists.txt $(HTTPPARSER_OBJ_TARGET) $(LIBSSH2_OBJ_TARGET)
 ifeq ($(OS),WINNT)
 	-cd $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR) && patch -p0 -f < $(SRCDIR)/patches/libgit2-ssh.patch
 else
diff --git a/deps/libssh2.mk b/deps/libssh2.mk
index 38cc7e6069879b..74decfa9682ec1 100644
--- a/deps/libssh2.mk
+++ b/deps/libssh2.mk
@@ -21,7 +21,7 @@ else
 LIBSSH2_OPTS += -DCRYPTO_BACKEND=mbedTLS -DENABLE_ZLIB_COMPRESSION=ON
 endif
 
-$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBSSH2_SRC_DIR)/CMakeLists.txt
+$(BUILDDIR)/$(LIBSSH2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBSSH2_SRC_DIR)/CMakeLists.txt $(MBEDTLS_OBJ_TARGET)
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
 	$(CMAKE) $(dir $<) $(LIBSSH2_OPTS)
diff --git a/deps/mbedtlsstream.mk b/deps/mbedtlsstream.mk
index 170c770bb7161e..b4d690999f444c 100644
--- a/deps/mbedtlsstream.mk
+++ b/deps/mbedtlsstream.mk
@@ -12,7 +12,7 @@ MBEDTLSSTREAM_OPTS := $(CMAKE_COMMON) -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_RPATH=$(build_prefix) \
 		-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE
 
-$(BUILDDIR)/$(MBEDTLSSTREAM_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(MBEDTLSSTREAM_SRC_DIR)/CMakeLists.txt
+$(BUILDDIR)/$(MBEDTLSSTREAM_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(MBEDTLSSTREAM_SRC_DIR)/CMakeLists.txt $(HTTPPARSER_OBJ_TARGET) $(LIBGIT2_OBJ_TARGET) $(MBEDTLS_OBJ_TARGET)
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
 	$(CMAKE) $(dir $<) $(MBEDTLSSTREAM_OPTS)
diff --git a/deps/patches/http_parser-win.patch b/deps/patches/http_parser-win.patch
index 0973658441ebb7..7e8600f0132ccd 100644
--- a/deps/patches/http_parser-win.patch
+++ b/deps/patches/http_parser-win.patch
@@ -1,12 +1,13 @@
-diff --git a/Makefile b/Makefile
-index 5f4eb22..983f669 100644
---- a/Makefile
-+++ b/Makefile
-@@ -18,18 +18,30 @@
+--- a/Makefile	2016-07-06 16:00:08.018383300 -0400
++++ b/Makefile	2016-07-06 16:07:00.211648100 -0400
+@@ -18,18 +18,33 @@
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  # IN THE SOFTWARE.
- 
-+VERSION = 2.7.0
+
++VERSION_MAJ = 2
++VERSION_MIN = 7
++VERSION_PCH = 0
++
  PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
 +ifeq ($(findstring cygwin,$(PLATFORM)), cygwin)
 +PLATFORM = winnt
@@ -19,11 +20,11 @@ index 5f4eb22..983f669 100644
  BINEXT ?=
  ifeq (darwin,$(PLATFORM))
 -SONAME ?= libhttp_parser.2.7.0.dylib
-+SONAME ?= libhttp_parser.$(VERSION).dylib
++SONAME ?= libhttp_parser.$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PCH).dylib
  SOEXT ?= dylib
 +else ifeq (winnt, $(PLATFORM))
 +CC = gcc
-+SONAME ?= libhttp_parser.$(VERSION).dll
++SONAME ?= libhttp_parser-$(VERSION_MAJ).$(VERSION_MIN).dll
 +SOEXT  ?= dll
  else ifeq (wine,$(PLATFORM))
  CC = winegcc
@@ -31,11 +32,11 @@ index 5f4eb22..983f669 100644
  HELPER = wine
  else
 -SONAME ?= libhttp_parser.so.2.7.0
-+SONAME ?= libhttp_parser.so.$(VERSION)
++SONAME ?= libhttp_parser.so.$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PCH)
  SOEXT ?= so
  endif
- 
-@@ -50,7 +62,12 @@ CFLAGS += -Wall -Wextra -Werror
+
+@@ -50,7 +65,12 @@
  CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
  CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
  CFLAGS_BENCH = $(CFLAGS_FAST) -Wno-unused-parameter
@@ -45,15 +46,15 @@ index 5f4eb22..983f669 100644
 +else
  CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
 +endif
- 
+
  LDFLAGS_LIB = $(LDFLAGS) -shared
- 
-@@ -141,7 +158,7 @@ clean:
+
+@@ -141,7 +161,7 @@
  	rm -f *.o *.a tags test test_fast test_g \
  		http_parser.tar libhttp_parser.so.* \
  		url_parser url_parser_g parsertrace parsertrace_g \
 -		*.exe *.exe.so
 +		*.exe *.exe.so *.dll
- 
+
  contrib/url_parser.c:	http_parser.h
  contrib/parsertrace.c:	http_parser.h
diff --git a/deps/patches/libgit2-custom-tls.patch b/deps/patches/libgit2-custom-tls.patch
index 43abcbfacd1138..cb06fe3e512a6b 100644
--- a/deps/patches/libgit2-custom-tls.patch
+++ b/deps/patches/libgit2-custom-tls.patch
@@ -1,53 +1,65 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93a9e47..75fe5ef 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -542,6 +542,9 @@ IF (OPENSSL_FOUND)
-   SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES})
- ENDIF()
- 
-+IF (USE_CUSTOM_TLS)
-+  ADD_DEFINITIONS(-DGIT_CUSTOM_TLS)
-+ENDIF()
- 
- 
- IF (THREADSAFE)
 diff --git a/src/settings.c b/src/settings.c
-index 00a3ef0..61e0199 100644
+index 00a3ef0..21430bc 100644
 --- a/src/settings.c
 +++ b/src/settings.c
-@@ -29,7 +29,7 @@ int git_libgit2_features(void)
+@@ -29,9 +29,7 @@ int git_libgit2_features(void)
  #ifdef GIT_THREADS
  		| GIT_FEATURE_THREADS
  #endif
 -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
-+#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CUSTOM_TLS)
  		| GIT_FEATURE_HTTPS
- #endif
+-#endif
  #if defined(GIT_SSH)
+ 		| GIT_FEATURE_SSH
+ #endif
 diff --git a/src/transport.c b/src/transport.c
-index 327052f..c4f3254 100644
+index 327052f..32f8464 100644
 --- a/src/transport.c
 +++ b/src/transport.c
-@@ -29,7 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
+@@ -29,9 +29,7 @@ static transport_definition local_transport_definition = { "file://", git_transp
  static transport_definition transports[] = {
  	{ "git://",   git_transport_smart, &git_subtransport_definition },
  	{ "http://",  git_transport_smart, &http_subtransport_definition },
 -#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
-+#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CUSTOM_TLS)
  	{ "https://", git_transport_smart, &http_subtransport_definition },
- #endif
+-#endif
  	{ "file://",  git_transport_local, NULL },
+ #ifdef GIT_SSH
+ 	{ "ssh://",   git_transport_smart, &ssh_subtransport_definition },
 diff --git a/src/transports/http.c b/src/transports/http.c
-index 4fbbfbb..9ef05c6 100644
+index 4fbbfbb..30520a0 100644
 --- a/src/transports/http.c
 +++ b/src/transports/http.c
-@@ -620,7 +620,7 @@ static int http_connect(http_subtransport *t)
+@@ -620,7 +620,6 @@ static int http_connect(http_subtransport *t)
  
  	error = git_stream_connect(t->io);
  
 -#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL)
-+#if defined(GIT_OPENSSL) || defined(GIT_SECURE_TRANSPORT) || defined(GIT_CURL) || defined(GIT_CUSTOM_TLS)
  	if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL &&
  	    git_stream_is_encrypted(t->io)) {
  		git_cert *cert;
+@@ -640,7 +639,7 @@ static int http_connect(http_subtransport *t)
+ 			return error;
+ 		}
+ 	}
+-#endif
++
+ 	if (error < 0)
+ 		return error;
+ 
+diff --git a/tests/core/features.c b/tests/core/features.c
+index 85cddfe..cf5e190 100644
+--- a/tests/core/features.c
++++ b/tests/core/features.c
+@@ -17,11 +17,7 @@ void test_core_features__0(void)
+ 	cl_assert((caps & GIT_FEATURE_THREADS) == 0);
+ #endif
+ 
+-#if defined(GIT_OPENSSL) || defined(GIT_WINHTTP) || defined(GIT_SECURE_TRANSPORT)
+ 	cl_assert((caps & GIT_FEATURE_HTTPS) != 0);
+-#else
+-	cl_assert((caps & GIT_FEATURE_HTTPS) == 0);
+-#endif
+ 
+ #if defined(GIT_SSH)
+ 	cl_assert((caps & GIT_FEATURE_SSH) != 0);