diff --git a/mail/bsmtp/files/patch-configure b/mail/bsmtp/files/patch-configure
index 22b7e859c2d8..e13f668979f6 100644
--- a/mail/bsmtp/files/patch-configure
+++ b/mail/bsmtp/files/patch-configure
@@ -1,34 +1,49 @@
-
-$FreeBSD$
-
---- configure.orig	2013-11-01 19:55:42.000000000 +0100
-+++ configure	2013-11-01 19:55:42.000000000 +0100
+--- configure.orig	2015-04-20 17:10:57 UTC
++++ configure
 @@ -41,6 +41,11 @@ if ($#ARGV == 0) {
    "batcher",
    "batcher.c",
    "bsmtp.c",
 +  "bsmtp.m4.8.14",
 +  "bsmtp.m4.8.13",
 +  "bsmtp.m4.8.12",
 +  "bsmtp.m4.8.11",
 +  "bsmtp.m4.8.10",
    "bsmtp.m4.8.9",
    "bsmtp.m4.8.8",
    "bsmtp.m4.8.7",
+@@ -146,7 +151,7 @@ if (! $redo) {
+           }
+         }
+       } elsif ($macro eq "\@DAEMONUID\@") {
+-        if (! defined @getpwnam) {
++        if (! @getpwnam) {
+           if (! defined $value{'@DAEMONUSER@'}) {
+             die "\@DAEMONUSER\@ must be defined before \@DAEMONUID\@\n";
+           }
+@@ -158,7 +163,7 @@ if (! $redo) {
+         ($name, $_, $uid, $_, $_, $_, $_, $_, $_) = @getpwnam;
+         $default[$i] = $uid;
+       } elsif ($macro eq "\@DAEMONGID\@") {
+-        if (! defined @getpwnam) {
++        if (! @getpwnam) {
+           if (! defined $value{'@DAEMONUSER@'}) {
+             die "\@DAEMONUSER\@ must be defined before \@DAEMONUID\@\n";
+           }
 @@ -198,6 +203,16 @@ if (! $redo) {
  	    $default[$i] = '8.8';
  	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) {
  	    $default[$i] = '8.9';
 +	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.10(\..*)?\s*$/) {
 +	    $default[$i] = '8.10';
 +	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.11(\..*)?\s*$/) {
 +	    $default[$i] = '8.11';
 +	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.12(\..*)?\s*$/) {
 +	    $default[$i] = '8.12';
 +	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.13(\..*)?\s*$/) {
 +	    $default[$i] = '8.13';
 +	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.14(\..*)?\s*$/) {
 +	    $default[$i] = '8.14';
  	  } else {
  	    $default[$i] = ''; # Will not be installed
  	  }