diff --git a/debian/changelog b/debian/changelog
index 567d6e9f5..e146d8ebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,15 @@ libgit2 (0.24.0-1) experimental; urgency=medium
 
  -- Andreas Henriksson <andreas@fatal.se>  Mon, 04 Apr 2016 15:30:44 +0200
 
+libgit2 (0.23.1-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Don't depend on OpenSSL, either directly or indirectly. Build with and
+    depend on libcurl4-gnutls-dev instead. (Closes: #798421)
+  * Drop associated Build-Depends on ca-certificates.
+
+ -- Josh Triplett <josh@joshtriplett.org>  Fri, 18 Mar 2016 17:08:00 -0700
+
 libgit2 (0.23.1-1) unstable; urgency=medium
 
   * New upstream release 0.23.1.
diff --git a/debian/control b/debian/control
index b6f95b382..1c5bbf0ca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: extra
 Maintainer: Russell Sim <russell.sim@gmail.com>
 Build-Depends: debhelper (>= 9.20120417), python-minimal (>= 2.4.0), pkg-config,
-               cmake, libz-dev, libcurl4-openssl-dev, libssl-dev,
-               libssh2-1-dev, libhttp-parser-dev, ca-certificates
+               cmake, libz-dev, libcurl4-gnutls-dev,
+               libssh2-1-dev, libhttp-parser-dev
 Standards-Version: 3.9.7
 Homepage: http://libgit2.github.com/
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/libgit2.git/
@@ -16,7 +16,7 @@ Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends: libgit2-24 (= ${binary:Version}), libz-dev,
-         libcurl4-openssl-dev, libssl-dev, libssh2-1-dev,
+         libcurl4-gnutls-dev, libssh2-1-dev,
          libhttp-parser-dev, ${shlibs:Depends}, ${misc:Depends}
 Description: low-level Git library (development files)
  libgit2 is a portable, pure C implementation of the Git
diff --git a/debian/rules b/debian/rules
index e82f17824..72436f3bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ TEST_TMPDIR := $(CURDIR)/tmp-test
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-debian-release -- \
 		-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+		-DUSE_OPENSSL:BOOL=OFF \
 		-DTHREADSAFE:BOOL=ON \
 		-DBUILD_CLAR:BOOL=ON \
 		-DLIB_INSTALL_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)
@@ -21,6 +22,7 @@ override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build-debian-devel -- \
 		-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DTHREADSAFE:BOOL=ON \
+		-DUSE_OPENSSL:BOOL=OFF \
 		-DBUILD_CLAR:BOOL=OFF \
 		-DBUILD_SHARED_LIBS:BOOL=OFF \
 		-DLIB_INSTALL_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)