diff --git a/nano/PKGBUILD b/nano/PKGBUILD
index f4c610fe..965ed591 100644
--- a/nano/PKGBUILD
+++ b/nano/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=nano
-pkgver=5.8
+pkgver=5.9
 pkgrel=1
 pkgdesc="Pico editor clone with enhancements"
 arch=('i686' 'x86_64')
@@ -20,11 +20,11 @@ source=(https://www.nano-editor.org/dist/v5/${pkgname}-${pkgver}.tar.xz{,.asc}
         2.2.4-wchar.patch
         nano-2.3.4-fix-ncurses-location.patch
         nano-2.8.0-msys2.patch)
-sha256sums=('e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c'
+sha256sums=('757db8cda4bb2873599e47783af463e3b547a627b0cabb30ea7bf71fb4c24937'
             'SKIP'
             '021d6bba4d45068b6d24aefdaed5044675f05b01430b68d27721f90d5ea6f5d3'
             '62b0e50470254ed09e55c068b29b72fe784d0552f97fbc5a15b6ee791c9cbd72'
-            'c3b66174c936ca5452dbb1cd31f09d9feeeb965bb7683a35e006900ad7d71667')
+            '5566700bbd3e8e157869d76086c731169d3352adb345fe9c3be48762b36a174e')
 validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7' # "Chris Allegretta <chrisa@asty.org>"
               'A7F6A64A67DA09EF92782DD79DF4862AF1175C5B' # "Benno Schulenberg <bensberg@justemail.net>"
               'BFD009061E535052AD0DF2150D28D4D2A0ACE884' # "Benno Schulenberg <bensberg@telfort.nl>"
diff --git a/nano/nano-2.8.0-msys2.patch b/nano/nano-2.8.0-msys2.patch
index f38dae53..0b5513e1 100644
--- a/nano/nano-2.8.0-msys2.patch
+++ b/nano/nano-2.8.0-msys2.patch
@@ -1,16 +1,16 @@
 diff -Naur nano-2.8.0/config.guess.orig nano-2.8.0/config.guess
 --- nano-2.8.0/config.guess.orig	2016-09-09 01:06:00.000000000 -0400
 +++ nano-2.8.0/config.guess	2017-04-09 01:22:34.067167300 -0400
-@@ -883,6 +883,9 @@ EOF
+@@ -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 ;;
      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
 diff -Naur nano-2.8.0/config.rpath.orig nano-2.8.0/config.rpath
 --- nano-2.8.0/config.rpath.orig	2017-04-08 18:50:34.621811900 -0400
 +++ nano-2.8.0/config.rpath	2017-04-08 20:10:26.717665200 -0400