diff --git a/packages/cgdb/build.sh b/packages/cgdb/build.sh
index cb2aa420d..3ce281c9a 100644
--- a/packages/cgdb/build.sh
+++ b/packages/cgdb/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://cgdb.github.io/
 TERMUX_PKG_DESCRIPTION="A lightweight curses (terminal-based) interface to the GNU Debugger (GDB)"
 TERMUX_PKG_DEPENDS="ncurses,readline,gdb,libutil"
 TERMUX_PKG_VERSION=0.7.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://cgdb.me/files/cgdb-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=bf7a9264668db3f9342591b08b2cc3bbb08e235ba2372877b4650b70c6fb5423
 TERMUX_PKG_BUILD_IN_SRC="yes"
diff --git a/packages/cgdb/cgdb.cpp.patch b/packages/cgdb/cgdb.cpp.patch
new file mode 100644
index 000000000..69b0f53e5
--- /dev/null
+++ b/packages/cgdb/cgdb.cpp.patch
@@ -0,0 +1,44 @@
+--- ../cache/cgdb-0.7.0/cgdb/cgdb.cpp	2017-03-10 16:44:18.000000000 +0000
++++ ./cgdb/cgdb.cpp	2018-10-10 05:05:23.164961985 +0000
+@@ -1523,10 +1523,10 @@
+ 
+     /* Shut down debugger */
+     tgdb_shutdown(tgdb);
+-
++#if !defined(__ANDROID__)
+     if (tty_set_attributes(STDIN_FILENO, &term_attributes) == -1)
+         clog_error(CLOG_CGDB, "tty_reset error");
+-
++#endif
+     /* Close our logfiles */
+     tgdb_close_logfiles();
+ 
+@@ -1577,10 +1577,10 @@
+     masterfd = pty_pair_get_masterfd(pty_pair);
+     if (masterfd == -1)
+         return -1;
+-
++#if !defined(__ANDROID__)
+     if (tty_off_xon_xoff(slavefd) == -1)
+-        return -1;
+-
++      return -1;
++#endif
+     /* The 16 is because I don't know how many char's the directory separator 
+      * is going to be, I expect it to be 1, but who knows. */
+     length = strlen(cgdb_home_dir) + strlen(readline_history_filename) + 16;
+@@ -1768,12 +1768,12 @@
+         clog_error(CLOG_CGDB, "Unable to init readline");
+         cgdb_cleanup_and_exit(-1);
+     }
+-
++#if !defined(__ANDROID__)
+     if (tty_cbreak(STDIN_FILENO, &term_attributes) == -1) {
+         clog_error(CLOG_CGDB, "tty_cbreak error");
+         cgdb_cleanup_and_exit(-1);
+     }
+-
++#endif
+     if (init_kui() == -1) {
+         clog_error(CLOG_CGDB, "init_kui error");
+         cgdb_cleanup_and_exit(-1);