diff --git a/packages/cmatrix/Makefile.in.patch b/packages/cmatrix/Makefile.in.patch
new file mode 100644
index 000000000..9948bb759
--- /dev/null
+++ b/packages/cmatrix/Makefile.in.patch
@@ -0,0 +1,14 @@
+Avoid make install trying to write to folders in /usr.
+
+diff -u -r ../cmatrix-1.2/Makefile.in ./Makefile.in
+--- ../cmatrix-1.2/Makefile.in	2017-06-23 11:51:59.000000000 +0200
++++ ./Makefile.in	2017-07-16 19:01:37.496306273 +0200
+@@ -760,7 +760,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-man
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-am
+ 
diff --git a/packages/cmatrix/build.sh b/packages/cmatrix/build.sh
index 5a300c8cb..c6a6fb97a 100644
--- a/packages/cmatrix/build.sh
+++ b/packages/cmatrix/build.sh
@@ -1,10 +1,12 @@
-TERMUX_PKG_HOMEPAGE=http://www.asty.org/cmatrix/
+TERMUX_PKG_HOMEPAGE=https://github.com/abishekvashok/cmatrix
 TERMUX_PKG_DESCRIPTION="Command producing a Matrix-style animation"
-TERMUX_PKG_VERSION=1.2a
-TERMUX_PKG_SRCURL=http://www.asty.org/cmatrix/dist/cmatrix-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=1fa6e6caea254b6fe70a492efddc1b40ad7ccb950a5adfd80df75b640577064c
+local _REAL_VERSION=1.2
+TERMUX_PKG_VERSION=${_REAL_VERSION}b
+TERMUX_PKG_SHA256=6b0b9aff4585147843c4cf8a8c9c6048500f66dc4887a38922197dfa326b57c8
+TERMUX_PKG_SRCURL=https://github.com/abishekvashok/cmatrix/archive/${_REAL_VERSION}.tar.gz
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--mandir=$TERMUX_PREFIX/share/man"
 TERMUX_PKG_DEPENDS="ncurses"
+TERMUX_PKG_FOLDERNAME=cmatrix-${_REAL_VERSION}
 
 termux_step_pre_configure () {
 	export ac_cv_file__usr_lib_kbd_consolefonts=no
diff --git a/packages/cmatrix/makefile.patch b/packages/cmatrix/makefile.patch
deleted file mode 100644
index 4405ddc61..000000000
--- a/packages/cmatrix/makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Avoid make install trying to write to folders in /usr.
-
-diff -u -r ../cmatrix-1.2a/Makefile.in ./Makefile.in
---- ../cmatrix-1.2a/Makefile.in	2002-04-01 04:11:59.000000000 +0200
-+++ ./Makefile.in	2014-03-06 22:56:09.268634166 +0100
-@@ -337,7 +337,7 @@
- install-exec-am: install-binPROGRAMS
- install-exec: install-exec-am
- 
--install-data-am: install-man install-data-local
-+install-data-am: install-man
- install-data: install-data-am
- 
- install-am: all-am