diff --git a/packages/cvs/build.sh b/packages/cvs/build.sh
new file mode 100644
index 000000000..e69c82c0e
--- /dev/null
+++ b/packages/cvs/build.sh
@@ -0,0 +1,6 @@
+TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/cvs/
+TERMUX_PKG_DESCRIPTION="Concurrent Versions System"
+TERMUX_PKG_VERSION=1.11.23
+TERMUX_PKG_SRCURL=http://ftp.gnu.org/non-gnu/cvs/source/stable/${TERMUX_PKG_VERSION}/cvs-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-server"
+TERMUX_PKG_RM_AFTER_INSTALL="bin/cvsbug share/man/man8/cvsbug.8"
diff --git a/packages/cvs/lib-getline.c.patch b/packages/cvs/lib-getline.c.patch
new file mode 100644
index 000000000..dfb84f53e
--- /dev/null
+++ b/packages/cvs/lib-getline.c.patch
@@ -0,0 +1,19 @@
+diff -u -r ../cvs-1.11.23/lib/getline.c ./lib/getline.c
+--- ../cvs-1.11.23/lib/getline.c	2005-04-04 16:46:05.000000000 -0400
++++ ./lib/getline.c	2016-03-29 17:34:23.536876927 -0400
+@@ -155,15 +155,6 @@
+ }
+ 
+ int
+-getline (lineptr, n, stream)
+-     char **lineptr;
+-     size_t *n;
+-     FILE *stream;
+-{
+-  return getstr (lineptr, n, stream, '\n', 0, GETLINE_NO_LIMIT);
+-}
+-
+-int
+ getline_safe (lineptr, n, stream, limit)
+      char **lineptr;
+      size_t *n;
diff --git a/packages/cvs/lib-getline.h.patch b/packages/cvs/lib-getline.h.patch
new file mode 100644
index 000000000..6358e7fdf
--- /dev/null
+++ b/packages/cvs/lib-getline.h.patch
@@ -0,0 +1,12 @@
+diff -u -r ../cvs-1.11.23/lib/getline.h ./lib/getline.h
+--- ../cvs-1.11.23/lib/getline.h	2005-04-04 16:46:05.000000000 -0400
++++ ./lib/getline.h	2016-03-29 17:31:15.020232824 -0400
+@@ -12,8 +12,6 @@
+ #define GETLINE_NO_LIMIT -1
+ 
+ int
+-  getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
+-int
+   getline_safe __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
+                          int limit));
+ int