diff --git a/mutt.changes b/mutt.changes
index 2f75971..b28ebe0 100644
--- a/mutt.changes
+++ b/mutt.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 10 08:03:38 UTC 2017 - tchvatal@suse.com
+
+- Switch to hunspell as default spell-checking software wrt
+  fate#323578
+- Write SUSE in the skel.muttrc instead of SuSE
+- Use the right folder for unpacking instead of symlink
+  * fixes quilt setup
+
 -------------------------------------------------------------------
 Thu Jul 13 10:38:57 UTC 2017 - olaf@aepfle.de
 
diff --git a/mutt.spec b/mutt.spec
index 744324b..50a4ece 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -31,6 +31,7 @@ BuildRequires:  automake
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  cyrus-sasl-gssapi
 BuildRequires:  gdbm-devel
+BuildRequires:  hunspell
 BuildRequires:  krb5-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libkyotocabinet-devel
@@ -45,10 +46,10 @@ BuildRequires:  opensp
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 %endif
-BuildRequires:  w3m
-#if
 BuildRequires:  libgpgme-devel
+BuildRequires:  w3m
 Url:            http://www.mutt.org
+Recommends:     hunspell
 Provides:       muttssl
 Obsoletes:      muttssl
 Recommends:     mutt-doc
@@ -127,8 +128,7 @@ BuildArch:      noarch
 Provides translations to the package mutt.
 
 %prep
-ln -sf neomutt-neomutt-%neo mutt-%version
-%setup -q -D -n mutt-%version
+%setup -q -D -n neomutt-neomutt-%neo
 %patch -p0 -b .p0
 %patch2 -p0 -b .pgpewrap
 %patch3 -p0 -b .sendgroupreplyto
@@ -188,7 +188,7 @@ cflags -Wl,--hash-size=8599		LDFLAGS
 cflags -pie				LDFLAGS
 export CC CFLAGS LDFLAGS
 export SENDMAIL=/usr/sbin/sendmail
-export ISPELL=/usr/bin/ispell
+export ISPELL=/usr/bin/hunspell
 export PATH="/usr/lib/mit/bin:$PATH"
 export KRB5CFGPATH="$(type -p krb5-config)"
 $KRB5CFGPATH --cflags gssapi
diff --git a/skel.muttrc b/skel.muttrc
index 5181c9d..60d2806 100644
--- a/skel.muttrc
+++ b/skel.muttrc
@@ -1,4 +1,4 @@
-# Sample ~/.muttrc for SuSE Linux
+# Sample ~/.muttrc for SUSE Linux
 
 # Setting
 set pager_context=4