diff --git a/neomutt-20180323.tar.gz b/neomutt-20180323.tar.gz
deleted file mode 100644
index 11d8fc5..0000000
--- a/neomutt-20180323.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4c498424cd6ded946c940f38df7cd01604a23059f258f05d979b2580eafc678b
-size 2650465
diff --git a/neomutt-20180512.tar.gz b/neomutt-20180512.tar.gz
new file mode 100644
index 0000000..d740414
--- /dev/null
+++ b/neomutt-20180512.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe573b9b6944c2d40d42e6ab62b711e9980da2d2bc36c533e0ba322fd9f3b851
+size 2758674
diff --git a/neomutt.changes b/neomutt.changes
index cc5a87f..9650a2e 100644
--- a/neomutt.changes
+++ b/neomutt.changes
@@ -1,3 +1,59 @@
+-------------------------------------------------------------------
+Mon May 14 00:00:00 CEST 2018 - dsterba@suse.cz
+
+- spec cleanup
+- update to 20180512
+  * Features
+    - echo command
+    - Add $browser_abbreviate_mailboxes
+    - Add ~M pattern to match mime Content-Types
+    - Add support for multipart/multilingual emails
+    - Jump to a collapsed email
+    - Add support for idn2 (IDNA2008)
+  * Bug Fixes
+    - Let mutt_ch_choose report conversion failure
+    - minor IMAP string handling fixes
+  * Translations
+    - Chinese (Simplified) (100%)
+    - Czech (100%)
+    - German (100%)
+    - Lithuanian (62%)
+    - Portuguese (Brazil) (100%)
+  * Coverity defects
+    - match prototypes to their functions
+    - make logic clearer
+    - reduce scope of variables
+    - fix coverity defects
+  * Docs
+    - development: analysis
+    - development: easy tasks
+    - development: roadmap
+  * Code
+    - start refactoring libconn
+    - split out progress functions
+    - split out window functions
+    - split out terminal setting
+    - convert MyVars to use TAILQ
+    - split mutt_file_{lock,unlock}
+    - Move IDN version string to mutt/idna.c
+    - refactor: init_locale()
+    - Eliminate static variable in mutt_file_dirname
+  * Tidy
+    - test int functions against 0
+    - rename lots of constants
+    - rename lots of functions
+    - sort lots of fields/definitions
+  * Upstream
+    - Increase account.user/login size to 128
+    - Fix comparison of flags with multiple bits set
+    - Change mutt_error call in mutt_gpgme_set_sender() to dprint
+    - Improve the error message when a signature is missing
+    - pager specific "show incoming mailboxes list" macro
+    - Improve gss debug printing of status_string
+    - Remove trailing null count from gss_buffer_desc.length field
+    - Add a comment in auth_gss about RFCs and null-termination
+    - Change prompt string for $crypt_verify_sig
+
 -------------------------------------------------------------------
 Fri Mar 23 00:00:00 CET 2018 - dsterba@suse.cz
 
diff --git a/neomutt.spec b/neomutt.spec
index 9ebc619..a7e55c0 100644
--- a/neomutt.spec
+++ b/neomutt.spec
@@ -17,12 +17,12 @@
 
 
 Name:           neomutt
-Version:        20180323
+Version:        20180512
 Release:        0
-Summary:        A command line mail reader based on Mutt
+Summary:        A command line mail reader (or MUA), a fork of Mutt with added features
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Email/Clients
-Url:            https://www.neomutt.org
+Url:            https://neomutt.org
 Source:         https://github.com/neomutt/neomutt/archive/%{name}-%{version}.tar.gz
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -58,12 +58,11 @@ new features. Can be installed in parallel with mutt.
 Summary:        Additional documentation for neomutt
 Group:          Documentation/Other
 Requires:       %{name} = %{version}
-Recommends:     perl(Expect)
-Provides:       %{name}:%{_docdir}/%{name}/COPYRIGHT
+#Recommends:     perl(Expect)
 BuildArch:      noarch
 
 %description doc
-Documentation for neomutt with neomuttrc examples for different environments
+Documentation for NeoMutt with neomuttrc examples for different environments
 and requirements.
 
 %lang_package macro
@@ -97,32 +96,29 @@ make %{?_smp_mflags}
 %files
 %config(noreplace) %{_sysconfdir}/neomuttrc
 %{_bindir}/neomutt
-%{_mandir}/man1/neomutt.1%{ext_man}
-%{_mandir}/man5/neomuttrc.5%{ext_man}
+%{_mandir}/man1/neomutt.1%{?ext_man}
+%{_mandir}/man5/neomuttrc.5%{?ext_man}
 %dir %{_prefix}/libexec
 %dir %{_prefix}/libexec/neomutt
 %{_prefix}/libexec/neomutt/pgpewrap
 %{_prefix}/libexec/neomutt/pgpring
 %{_prefix}/libexec/neomutt/smime_keys
-%{_mandir}/man1/pgpewrap_neomutt.1%{ext_man}
-%{_mandir}/man1/pgpring_neomutt.1%{ext_man}
-%{_mandir}/man1/smime_keys_neomutt.1%{ext_man}
-%{_mandir}/man5/mbox_neomutt.5%{ext_man}
-%{_mandir}/man5/mmdf_neomutt.5%{ext_man}
+%{_mandir}/man1/pgpewrap_neomutt.1%{?ext_man}
+%{_mandir}/man1/pgpring_neomutt.1%{?ext_man}
+%{_mandir}/man1/smime_keys_neomutt.1%{?ext_man}
+%{_mandir}/man5/mbox_neomutt.5%{?ext_man}
+%{_mandir}/man5/mmdf_neomutt.5%{?ext_man}
 # this file is used from the default /etc/neomuttrc and moved from neomutt-doc
 %dir %{_docdir}/neomutt
 %doc %{_docdir}/neomutt/manual.txt
 
 %files doc
 %dir %{_docdir}/neomutt
-%doc %{_docdir}/%{name}/COPYRIGHT
 %doc %{_docdir}/%{name}/README*
 %doc %{_docdir}/%{name}/ChangeLog.md
 %doc %{_docdir}/%{name}/CODE_OF_CONDUCT.md
 %dir %{_docdir}/%{name}/
 %doc %{_docdir}/%{name}/*.html
-#%doc %{_docdir}/%{name}/*.txt
-%doc %{_docdir}/neomutt/INSTALL
 %doc %{_docdir}/neomutt/PGP-Notes.txt
 %doc %{_docdir}/neomutt/mime.types
 %doc %{_docdir}/neomutt/smime-notes.txt
@@ -146,7 +142,7 @@ make %{?_smp_mflags}
 %dir %doc %{_docdir}/%{name}/lua/
 %doc %{_docdir}/%{name}/lua/test_lua-api_runner.neomuttrc
 %doc %{_docdir}/%{name}/lua/test_lua-api_spec.lua
-%doc %{_docdir}/neomutt/LICENSE.md
+%license %{_docdir}/neomutt/LICENSE.md
 
 %files lang -f %{name}.lang