diff --git a/libtasn1/PKGBUILD b/libtasn1/PKGBUILD
index f3adec02..b5701ea2 100644
--- a/libtasn1/PKGBUILD
+++ b/libtasn1/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=libtasn1
 pkgname=('libtasn1' 'libtasn1-devel')
-pkgver=4.17.0
-pkgrel=2
+pkgver=4.18.0
+pkgrel=1
 pkgdesc="A library for Abstract Syntax Notation One (ASN.1) and Distinguish Encoding Rules (DER) manipulation"
 arch=('i686' 'x86_64')
 license=('GPL3' 'LGPL')
@@ -11,10 +11,10 @@ url="https://www.gnu.org/software/libtasn1/"
 makedepends=('gcc' 'texinfo' 'make' 'patch' 'gtk-doc')
 source=(https://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}
         libtasn1-3.3-msys2.patch)
-sha256sums=('ece7551cea7922b8e10d7ebc70bc2248d1fdd73351646a2d6a8d68a9421c45a5'
+sha256sums=('4365c154953563d64c67a024b607d1ee75c6db76e0d0f65709ea80a334cd1898'
             'SKIP'
-            '68815336dcbbcf98cd62451bda5e2be97c01a22d8d7455cd8d7616d614a5e60e')
-validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson <simon@josefsson.org>
+            '9ec4aeedf95091777803ea3d80b167b258ab299bf23968ca7e1bef1e71707ac9')
+validpgpkeys=('B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE') # Simon Josefsson <simon@josefsson.org>
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/libtasn1/libtasn1-3.3-msys2.patch b/libtasn1/libtasn1-3.3-msys2.patch
index 9cf61310..efca20f4 100644
--- a/libtasn1/libtasn1-3.3-msys2.patch
+++ b/libtasn1/libtasn1-3.3-msys2.patch
@@ -1,13 +1,13 @@
 diff -Naur libtasn1-3.3-orig/build-aux/config.guess libtasn1-3.3/build-aux/config.guess
 --- libtasn1-3.3-orig/build-aux/config.guess	2013-03-24 10:26:53.000000000 +0000
 +++ libtasn1-3.3/build-aux/config.guess	2013-04-25 09:50:38.147460900 +0000
-@@ -844,6 +844,9 @@
+@@ -947,6 +947,9 @@
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
+ 	GUESS=x86_64-pc-cygwin
+ 	;;
 +    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
++	GUESS=x86_64-unknown-msys
++	;;
      prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;
+ 	SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`
+ 	GUESS=powerpcle-unknown-solaris2$SUN_REL