diff -ur mutt-1.8.0.orig/contrib/Makefile.am mutt-1.8.0/contrib/Makefile.am

--- mutt-1.8.0.orig/contrib/Makefile.am	2017-02-25 15:28:22.124997366 +0000

+++ mutt-1.8.0/contrib/Makefile.am	2017-02-25 15:48:10.834036861 +0000

@@ -6,7 +6,7 @@

 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \

 	sample.muttrc-compress sample.muttrc-starter \

 	sample.vimrc-sidebar colors.default colors.linux smime.rc \

-	ca-bundle.crt smime_keys_test.pl mutt_xtitle markdown2html \

+	smime_keys_test.pl mutt_xtitle markdown2html \

 	bgedit-detectgui.sh bgedit-screen-tmux.sh \

 	mutt_oauth2.py mutt_oauth2.py.README

diff -ur mutt-1.8.0.orig/doc/smime-notes.txt mutt-1.8.0/doc/smime-notes.txt

--- mutt-1.8.0.orig/doc/smime-notes.txt	2017-02-25 15:28:22.119997501 +0000

+++ mutt-1.8.0/doc/smime-notes.txt	2017-02-25 16:06:38.986242390 +0000

@@ -40,8 +40,10 @@

 - Edit the smime_sign_as line in your muttrc, replacing the keyid with your

   own.

-- You probably want to import the trusted roots in

-  contrib/ca-bundle.crt. This makes you trust anything that was ultimately

+- There is no more ca-bundle.crt file with the trusted roots to import shipped 

+  in mutt. The upstream file is out-dated and user is encouraged to use 

+  ca-bundle.crt from ca-certificate package.

+  This makes you trust anything that was ultimately

   signed by one of them. You can use "smime_keys add_root" to do so, or

   just copy ca-bundle.crt into the place you point mutt's smime_ca_location

   variable to.