diff --git a/mintty/01-array-bounds.patch b/mintty/01-array-bounds.patch
deleted file mode 100644
index baaec747..00000000
--- a/mintty/01-array-bounds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mintty/wintext.c.orig	2014-10-29 08:11:51.439600000 +0300
-+++ mintty/wintext.c	2014-10-29 08:12:26.758000000 +0300
-@@ -17,7 +17,7 @@
-   FONT_WIDE       = 0x04,
-   FONT_HIGH       = 0x08,
-   FONT_NARROW     = 0x10,
--  FONT_MAXNO      = 0x1F,
-+  FONT_MAXNO      = 0x20,
-   FONT_SHIFT      = 5
- };
- 
diff --git a/mintty/02-mintty-add-msys-64bit.patch b/mintty/02-mintty-add-msys-64bit.patch
index d6684af0..366404c8 100644
--- a/mintty/02-mintty-add-msys-64bit.patch
+++ b/mintty/02-mintty-add-msys-64bit.patch
@@ -1,9 +1,9 @@
---- mintty/Makefile.orig	2013-11-01 08:19:44.606800000 +0400
-+++ mintty/Makefile	2013-11-01 08:22:53.762800000 +0400
-@@ -37,6 +37,9 @@
+--- a/src/Makefile	2013-11-01 08:19:44.606800000 +0400
++++ b/src/Makefile	2013-11-01 08:22:53.762800000 +0400
+@@ -40,6 +40,9 @@
  else ifeq ($(TARGET), i686-pc-msys)
    platform := msys
-   zip_files := docs/readme-msys.html
+   zip_files := ../docs/readme-msys.html
 +else ifeq ($(TARGET), x86_64-pc-msys)
 +  platform := msys
 +  zip_files := docs/readme-msys.html
diff --git a/mintty/PKGBUILD b/mintty/PKGBUILD
index 96667dad..9aa175ac 100644
--- a/mintty/PKGBUILD
+++ b/mintty/PKGBUILD
@@ -1,46 +1,40 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=mintty
-pkgver=1322
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="Terminal emulator with native Windows look and feel"
 arch=('i686' 'x86_64')
 license=('GPL3')
 groups=('base')
 depends=('sh')
-makedepends=('subversion')
-url="https://code.google.com/p/mintty/"
-source=("mintty"::'svn+http://mintty.googlecode.com/svn/trunk/'
-        01-array-bounds.patch
+url="https://mintty.github.io"
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mintty/mintty/archive/${pkgver}.tar.gz
         02-mintty-add-msys-64bit.patch)
-#http://mintty.googlecode.com/files/${pkgname}-${pkgver}-src.tar.bz2
-sha1sums=('SKIP'
-          '087d131896f53635d879959f8f0b538f81fd37a5'
-          'ce948d06bb62308e59966c7816301df415cc6074')
-#sha1sums=('54160819e1e6d37ef1a69aac0cb909ba10d30175')
-
-pkgver() {
-  cd "$srcdir/$pkgname"
-  local ver="$(svnversion)"
-  printf "%s" "${ver//[[:alpha:]]}"
-}
+sha1sums=('18a28d22c7dabbb9bf5de54d3f7eb73bc4001281'
+          'f3686ce7f28a954b058c155016a884480c06d6b0')
 
 prepare() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ${srcdir}/01-array-bounds.patch
+  cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i ${srcdir}/02-mintty-add-msys-64bit.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   mkdir -p ${pkgdir}/usr/{bin,share}
   mkdir -p ${pkgdir}/usr/share/man/man1
+  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
+  
 
-  install -m755 mintty.exe ${pkgdir}/usr/bin/mintty.exe
+  install -m755 src/mintty.exe ${pkgdir}/usr/bin/mintty.exe
   install -m644 docs/mintty.1 ${pkgdir}/usr/share/man/man1/mintty.1
+  
+  install -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -m644 LICENSE.Oxygen ${pkgdir}/usr/share/licenses/${pkgname}/
+  install -m644 LICENSE.PuTTY ${pkgdir}/usr/share/licenses/${pkgname}/
 }