diff --git a/packages/mime-support/build.sh b/packages/mime-support/build.sh
index 445970b41..2152625e8 100644
--- a/packages/mime-support/build.sh
+++ b/packages/mime-support/build.sh
@@ -2,7 +2,12 @@ TERMUX_PKG_HOMEPAGE=https://packages.debian.org/en/stretch/mime-support
 TERMUX_PKG_DESCRIPTION="MIME type associations for file types"
 TERMUX_PKG_VERSION=3.60
 TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/m/mime-support/mime-support_$TERMUX_PKG_VERSION.tar.gz
+TERMUX_PKG_SHA256=f31d81f68dc007f56567cc14fb3b2effbd42d1dd087e414508e14e33d1a6a3a4
 TERMUX_PKG_FOLDERNAME=mime-support
+TERMUX_PKG_PLATFORM_INDEPENDENT=yes
+TERMUX_PKG_CONFFILES="etc/mime.types"
+# etc/mime.types was previously in mutt:
+TERMUX_PKG_CONFLICTS="mutt (<< 1.8.3-1)"
 
 termux_step_make_install() {
 	cp $TERMUX_PKG_SRCDIR/mime.types $TERMUX_PREFIX/etc
diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh
index e0e6e32ea..6c53d1b67 100644
--- a/packages/mutt/build.sh
+++ b/packages/mutt/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
 TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
 TERMUX_PKG_VERSION=1.8.3
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache --with-sasl --enable-sidebar"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
 # The mutt autoconf guesses no for working (v)snprintf and uses broken local versions - avoid that:
@@ -11,8 +12,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" mutt_cv_c99_snprintf=yes mutt_cv_c99_vsnprint
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-gpgme"
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-sasl"
 # bin/{flea,muttbug}: File bug against mutt:
-TERMUX_PKG_RM_AFTER_INSTALL="bin/flea bin/muttbug share/man/man1/muttbug.1 share/man/man1/flea.1"
-TERMUX_PKG_CONFFILES="etc/mime.types etc/Muttrc"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/flea
+bin/muttbug
+share/man/man1/muttbug.1
+share/man/man1/flea.1
+etc/mime.types
+"
+TERMUX_PKG_CONFFILES="etc/Muttrc"
 
 termux_step_post_configure () {
 	# Build wants to run mutt_md5 and makedoc: