diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 2b42a275d8c7..86ad4031622f 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,15 +1,21 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
 
 stdenv.mkDerivation rec {
-  name = "msmtp-1.4.32";
+  version = "1.6.1";
+  name = "msmtp-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/msmtp/${name}.tar.bz2";
-    sha256 = "122z38pv4q03w3mbnhrhg4w85a51258sfdg2ips0b6cgwz3wbw1b";
+    url = "mirror://sourceforge/msmtp/${name}.tar.xz";
+    sha256 = "1ws6hdpm8vfq4vwxjwgd8xndx5ax1ppnmxn0fhzlwj3pvkr4fpf4";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
 
+  postInstall = ''
+    cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
+    chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq
+  '';
+
   meta = {
       description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
       homepage = "http://msmtp.sourceforge.net/";