diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile
index e601f48a138..3bbfb4251f1 100644
--- a/mail/msmtp/Makefile
+++ b/mail/msmtp/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.36 2013/03/11 11:23:51 espie Exp $
+# $OpenBSD: Makefile,v 1.37 2013/04/23 14:32:26 gsoares Exp $
 
 COMMENT =		SMTP plugin for MUAs
 
-DISTNAME =		msmtp-1.4.30
+DISTNAME =		msmtp-1.4.31
 CATEGORIES =		mail
 
 HOMEPAGE =		http://msmtp.sourceforge.net/
diff --git a/mail/msmtp/distinfo b/mail/msmtp/distinfo
index 9b27aeb5721..4678059adb6 100644
--- a/mail/msmtp/distinfo
+++ b/mail/msmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (msmtp-1.4.30.tar.bz2) = 8VK5KW4240DrBJx+5NaYD82ynZSOZUvcdL6n7pdAmIY=
-SIZE (msmtp-1.4.30.tar.bz2) = 303226
+SHA256 (msmtp-1.4.31.tar.bz2) = JHr5qV+iL1BuhRCfxCaKXZHKA6+bF+68weRrfNZMIl8=
+SIZE (msmtp-1.4.31.tar.bz2) = 305770
diff --git a/mail/msmtp/patches/patch-scripts_msmtpq_msmtpq b/mail/msmtp/patches/patch-scripts_msmtpq_msmtpq
index c7860f6b05f..ca57f4467ae 100644
--- a/mail/msmtp/patches/patch-scripts_msmtpq_msmtpq
+++ b/mail/msmtp/patches/patch-scripts_msmtpq_msmtpq
@@ -1,9 +1,9 @@
-$OpenBSD: patch-scripts_msmtpq_msmtpq,v 1.1 2008/10/19 20:35:01 jasper Exp $
---- scripts/msmtpq/msmtpq.orig	Mon Jul 28 00:20:41 2008
-+++ scripts/msmtpq/msmtpq	Tue Oct 14 14:18:13 2008
+$OpenBSD: patch-scripts_msmtpq_msmtpq,v 1.2 2013/04/23 14:32:26 gsoares Exp $
+--- scripts/msmtpq/msmtpq.orig	Thu Feb 14 16:33:59 2013
++++ scripts/msmtpq/msmtpq	Thu Mar 21 21:12:19 2013
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/sh
  
- #--------------------------------------------------------------
- #
+ ##--------------------------------------------------------------
+ ##