--- wikisrc/users/wiz/mutt-smime.mdwn	2016/01/07 15:08:55	1.1
+++ wikisrc/users/wiz/mutt-smime.mdwn	2016/02/22 09:31:58	1.3
@@ -28,7 +28,7 @@ You also need gnupg version 2.x installe
 
 In pkgsrc, set
 
-	PKG_OPTIONS.mutt=       gpgme
+	PKG_OPTIONS.mutt+=       gpgme
 
 in your /etc/mk.conf.
 
@@ -48,7 +48,7 @@ these lines, you don't need them any lon
 ## gpg-agent
 
 You can use generic setup instructions for gnupg 2.x instead of this
-section; I include them for completeness. They also apply for PGP, so
+section; I include them for completeness. They also apply for OpenPGP, so
 if you have that set up for gnupg 2.x already, you can skip it.
 
 You need to have a gpg-agent running. The suggest setup (by gnugp) is
@@ -122,7 +122,7 @@ You'll have to tell gpgsm which certific
 
 	gpgsm -k --with-validation
 
-In case this doesn't happen, you'll see
+When you don't do that, you'll see
 
 	Problem signature
 
@@ -139,11 +139,11 @@ to your .gnupg/gpgsm.conf config file, w
 XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX is the
 fingerprint of your key. If you don't know it, you can find it using
 
-	gpg -K your@email.address
+	gpgsm -K your@email.address
 
 or just
 
-	gpg -K
+	gpgsm -K
 
 If you don't set this, gpgsm will use the first secret key in your
 keychain.