diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index 749b8c4e3cd..c665d6cf27b 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.30 2013/03/11 11:44:43 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2014/09/08 17:44:18 jca Exp $
 
 COMMENT=		highly customizable e-mail to HTML converter
 
-DISTNAME=		MHonArc-2.6.18
+DISTNAME=		MHonArc-2.6.19
 PKGNAME=		${DISTNAME:L}
-REVISION=		0
 CATEGORIES=		www mail
 
 HOMEPAGE=		http://www.mhonarc.org/
 
 MASTER_SITES=		http://www.mhonarc.org/release/MHonArc/tar/ \
-			http://www.nacs.uci.edu/indiv/ehood/tar/ \
-			ftp://ftp.plig.org/pub/CPAN/authors/id/EHOOD/
+			http://mhonarc.domainunion.de/release/MHonArc/tar/
 
 MAINTAINER=		Christian Rueger <cr+openbsd@rueger-net.de>
 
diff --git a/www/mhonarc/distinfo b/www/mhonarc/distinfo
index f9cccfb5c98..ad9baa86ffd 100644
--- a/www/mhonarc/distinfo
+++ b/www/mhonarc/distinfo
@@ -1,5 +1,2 @@
-MD5 (MHonArc-2.6.18.tar.gz) = tl5Y/W00mZST9z772Ns8Rw==
-RMD160 (MHonArc-2.6.18.tar.gz) = 9fcnf5n49it4+b0EpXnwdd7NkbQ=
-SHA1 (MHonArc-2.6.18.tar.gz) = xfuzYJxABFY2YsIBUtW5Axf8Us8=
-SHA256 (MHonArc-2.6.18.tar.gz) = QnWdM3wT/4fbwLwId032cVZAX7/BDpYvZApl7poRrvY=
-SIZE (MHonArc-2.6.18.tar.gz) = 1984873
+SHA256 (MHonArc-2.6.19.tar.gz) = +L8odObqN4MLDVFV+5ms94gAWHffdXPxJ2NE6Ufag1I=
+SIZE (MHonArc-2.6.19.tar.gz) = 1992055
diff --git a/www/mhonarc/patches/patch-lib_mhamain_pl b/www/mhonarc/patches/patch-lib_mhamain_pl
deleted file mode 100644
index 798ade600d6..00000000000
--- a/www/mhonarc/patches/patch-lib_mhamain_pl
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-lib_mhamain_pl,v 1.1 2012/05/07 20:13:50 pascal Exp $
-defined(%hash) is deprecated
---- lib/mhamain.pl.orig	Mon May  7 12:00:36 2012
-+++ lib/mhamain.pl	Mon May  7 12:01:44 2012
-@@ -1561,7 +1561,7 @@ sub signal_catch {
- ##	Create Index2MsgId if not defined
- ##
- sub defineIndex2MsgId {
--    if (!defined(%Index2MsgId)) {
-+    if (!%Index2MsgId) {
- 	foreach (keys %MsgId) {
- 	    $Index2MsgId{$MsgId{$_}} = $_;
- 	}
diff --git a/www/mhonarc/patches/patch-lib_readmail_pl b/www/mhonarc/patches/patch-lib_readmail_pl
deleted file mode 100644
index ee2f9595fdf..00000000000
--- a/www/mhonarc/patches/patch-lib_readmail_pl
+++ /dev/null
@@ -1,76 +0,0 @@
-$OpenBSD: patch-lib_readmail_pl,v 1.1 2012/05/07 20:13:50 pascal Exp $
-defined(%hash) is deprecated
---- lib/readmail.pl.orig	Mon May  7 12:02:06 2012
-+++ lib/readmail.pl	Mon May  7 12:04:04 2012
-@@ -117,9 +117,9 @@ $DecodeHeader	= 0;
- ##  set to true.
- 
- %MIMEDecoders			= ()
--    unless defined(%MIMEDecoders);
-+    unless %MIMEDecoders;
- %MIMEDecodersSrc		= ()
--    unless defined(%MIMEDecodersSrc);
-+    unless %MIMEDecodersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMECharSetConverters is the associative array for storing functions
-@@ -153,9 +153,9 @@ $DecodeHeader	= 0;
- ##  string.
- 
- %MIMECharSetConverters			= ()
--    unless defined(%MIMECharSetConverters);
-+    unless %MIMECharSetConverters;
- %MIMECharSetConvertersSrc		= ()
--    unless defined(%MIMECharSetConvertersSrc);
-+    unless %MIMECharSetConvertersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEFilters is the associative array for storing functions that
-@@ -180,9 +180,9 @@ $DecodeHeader	= 0;
- ##  that all functions are defined before invoking MAILread_body.
- 
- %MIMEFilters	= ()
--    unless defined(%MIMEFilters);
-+    unless %MIMEFilters;
- %MIMEFiltersSrc	= ()
--    unless defined(%MIMEFiltersSrc);
-+    unless %MIMEFiltersSrc;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEFiltersArgs is the associative array for storing any optional
-@@ -196,7 +196,7 @@ $DecodeHeader	= 0;
- ##  listed for a function if both are applicable.
- 
- %MIMEFiltersArgs	= ()
--    unless defined(%MIMEFiltersArgs);
-+    unless %MIMEFiltersArgs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEExcs is the associative array listing which data types
-@@ -206,7 +206,7 @@ $DecodeHeader	= 0;
- ##	Values => <should evaluate to a true expression>
- 
- %MIMEExcs			= ()
--    unless defined(%MIMEExcs);
-+    unless %MIMEExcs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMEIncs is the associative array listing which data types
-@@ -220,7 +220,7 @@ $DecodeHeader	= 0;
- ##  be used to only allow a well-defined set of content-types.
- 
- %MIMEIncs			= ()
--    unless defined(%MIMEIncs);
-+    unless %MIMEIncs;
- 
- ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ##  %MIMECharsetAliases is a mapping of charset names to charset names.
-@@ -231,7 +231,7 @@ $DecodeHeader	= 0;
- ##	Values => real charset name
- ##
- %MIMECharsetAliases = ()
--    unless defined(%MIMECharsetAliases);
-+    unless %MIMECharsetAliases;
- 
- ##---------------------------------------------------------------------------
- ##	Text entity-related variables