diff --git a/packages/cvs/build.sh b/packages/cvs/build.sh
index 9fe3a3574..4387f0173 100644
--- a/packages/cvs/build.sh
+++ b/packages/cvs/build.sh
@@ -1,11 +1,12 @@
 TERMUX_PKG_HOMEPAGE=https://www.nongnu.org/cvs/
 TERMUX_PKG_DESCRIPTION="Concurrent Versions System"
-TERMUX_PKG_VERSION=1.12.13
-TERMUX_PKG_SHA256=27f3bc1be1f538a8390faab1d452db3ea90f55065e3dc0efe095457243a409b3
-TERMUX_PKG_SRCURL=https://fossies.org/linux/misc/old/cvs-$TERMUX_PKG_VERSION.tar.xz
+TERMUX_PKG_VERSION="1.12.13+real-26"
+TERMUX_PKG_SHA256=0eda91f5e8091b676c90b2a171f24f9293acb552f4e4f77b590ae8d92a547256
+TERMUX_PKG_SRCURL="https://dl.bintray.com/termux/upstream/cvs-$TERMUX_PKG_VERSION.tar.xz"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 cvs_cv_func_printf_ptr=yes
 ac_cv_header_syslog_h=no
 --disable-server
+--with-external-zlib
 "
 TERMUX_PKG_RM_AFTER_INSTALL="bin/cvsbug share/man/man8/cvsbug.8"
diff --git a/packages/cvs/src-log.c.patch b/packages/cvs/src-log.c.patch
new file mode 100644
index 000000000..1aa278397
--- /dev/null
+++ b/packages/cvs/src-log.c.patch
@@ -0,0 +1,18 @@
+diff -u -r ../cvs-1.12.13+real-26/src/log.c ./src/log.c
+--- ../cvs-1.12.13+real-26/src/log.c	2018-06-26 04:32:38.051089628 +0200
++++ ./src/log.c	2018-06-26 04:42:11.865303837 +0200
+@@ -1790,12 +1790,14 @@
+ 	int buftag = 'M';
+ 	static char has_logm = 0;
+ 
++#ifdef SERVER_SUPPORT
+ 	if (server_active) {
+ 		if (!has_logm)
+ 			has_logm = supported_response("LOGM") ? 1 : 2;
+ 		if (has_logm == 1)
+ 			buftag = CVS_OUTPUT_EX_LOGM;
+ 	}
++#endif
+ 
+ 	cvs_output_ex(str, len, buftag);
+ 	if (/*len > 0 &&*/ str[len - 1] != '\n')