diff --git a/.gitignore b/.gitignore
index f077acc..29cdb84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,6 @@ ctags
 i3/config
 i3status.conf
 mbsyncrc
+msmtprc
 authinfo
 config/vdirsyncer/config
diff --git a/Makefile b/Makefile
index 08470a6..8271209 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,9 @@ install-vim-plug:
 config/vdirsyncer/config: config/vdirsyncer/config.m4
 	umask 077; m4 $< >$@
 
+msmtprc: msmtprc.m4
+	umask 077; m4 $< >$@
+
 mbsyncrc: mbsyncrc.m4
 	umask 077; m4 $< >$@
 
diff --git a/msmtprc b/msmtprc.m4
similarity index 74%
rename from msmtprc
rename to msmtprc.m4
index 6ae22e4..77df49c 100644
--- a/msmtprc
+++ b/msmtprc.m4
@@ -8,6 +8,6 @@ host mail.gebner.org
 #from gebner@gebner.org
 auth on
 user gebner
-passwordeval "pass 2b7e.org/mail.gebner.org 2>/dev/null | head -n1"
+password esyscmd(`pass 2b7e.org/mail.gebner.org | head -n1')
 
 account default : gebner.org