diff --git a/srcpkgs/neomutt/INSTALL.msg b/srcpkgs/neomutt/INSTALL.msg
new file mode 100644
index 00000000000..940935fe5a3
--- /dev/null
+++ b/srcpkgs/neomutt/INSTALL.msg
@@ -0,0 +1,2 @@
+As of 20171013, neomutt is no longer mutt. System config is in /etc/neomuttrc
+Due to upstream's choice, we have removed the alternatives for neomutt files.
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index aaee45cdec3..23f2c5c2207 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,55 +1,28 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20170912
+version=20171013
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
-configure_args="--enable-pop --enable-imap --enable-smtp --with-gdbm
- --enable-gpgme --with-idn --with-ssl --with-sasl --enable-notmuch --enable-lua
- --enable-sidebar --enable-nfs-fix --sysconfdir=/etc/$pkgname"
-hostmakedepends="automake"
+configure_script=./configure.autosetup
+configure_args="--ssl --gpgme --notmuch --gdbm --lua --sasl"
+hostmakedepends="libxslt docbook-xsl w3m"
 makedepends="ncurses-devel gpgme-devel libidn-devel libressl-devel libsasl-devel
  gdbm-devel aspell-devel libnotmuch-devel gettext-devel lua-devel"
 depends="mime-types"
-conf_files="/etc/$pkgname/Muttrc"
+conf_files="/etc/neomuttrc"
 short_desc="Mutt with misc fixes and feature patches"
-maintainer="Toyam Cox <Vaelatern@gmail.com>"
+maintainer="Toyam Cox <Vaelatern@voidlinux.eu>"
 license="GPL-2"
 homepage="http://www.neomutt.org"
 distfiles="https://github.com/neomutt/neomutt/archive/neomutt-${version}.tar.gz"
-checksum=9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657
+checksum=5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55
 
 case "${XBPS_TARGET_MACHINE}" in
 	x86_64-musl) CFLAGS="-D_FILE_OFFSET_BITS=64 -DLARGEFILE_SOURCE=1";;
 	# Inquiry: Do we have largefile support on everywhere?
 esac
 
-provides="mutt-0_1"
-# Begin alternatives:
-alternatives="
- mutt:mutt:/usr/bin/mutt-$pkgname
- mutt:pgpewrap:/usr/bin/pgpewrap-$pkgname
- mutt:flea:/usr/bin/flea-$pkgname
- mutt:muttbug:/usr/bin/muttbug-$pkgname
- mutt:smime_keys:/usr/bin/smime_keys-$pkgname
-
- mutt:pgpewrap.1:/usr/share/man/man1/pgpewrap-${pkgname}.1
- mutt:flea.1:/usr/share/man/man1/flea-${pkgname}.1
- mutt:mutt.1:/usr/share/man/man1/mutt-${pkgname}.1
- mutt:pgpring.1:/usr/share/man/man1/pgpring-${pkgname}.1
- mutt:muttbug.1:/usr/share/man/man1/muttbug-${pkgname}.1
- mutt:smime_keys.1:/usr/share/man/man1/smime_keys-${pkgname}.1
-
- mutt:mbox.5:/usr/share/man/man5/mbox-${pkgname}.5
- mutt:muttrc.5:/usr/share/man/man5/muttrc-${pkgname}.5
- mutt:mmdf.5:/usr/share/man/man5/mmdf-${pkgname}.5
-"
-# End alternatives
-
-pre_configure() {
-	autoreconf -fi
-}
-
 post_install() {
 	# provided by mime-types
 	rm "${DESTDIR}"/etc/${pkgname}/mime.*
@@ -57,14 +30,6 @@ post_install() {
 	# move dist to examples dir
 	vsconf contrib/gpg.rc Muttrc.gpg.dist
 	mv "${DESTDIR}/etc/$pkgname/Muttrc.dist" "${DESTDIR}/usr/share/examples/${pkgname}"
-
-	# Allows alternatives to work
-	for manpage in "${DESTDIR}"/usr/share/man/man[15]/*; do
-		mv "$manpage" "${manpage%.*}-${pkgname}.${manpage##*.}"
-	done
-	for binary in "${DESTDIR}"/usr/bin/*; do
-		mv "$binary" "${binary}-${pkgname}"
-	done
 }
 
 # REMARKS:
@@ -77,3 +42,7 @@ post_install() {
 # In version 20160808 keybase integration was added, and lots of new
 # documentation now gets installed. Rumors of an /etc/NeoMuttrc are in the
 # release notes but not currently installed for unknown reasons.
+# As of 20171013, neomutt has hard forked and no longer refers to itself as
+# "Mutt" anywhere in the codebase. https://www.neomutt.org/2017/10/13/release
+# /etc/neomuttrc now exists, and there are no conflicts with regular mutt.
+# Due to this, an install.msg was added and all alternatives were removed.