diff --git a/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile
index f9361d812716..9f1bf0c93c28 100644
--- a/databases/pear-MDB2/Makefile
+++ b/databases/pear-MDB2/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	MDB2
 DISTVERSION=	2.5.0b5
+PORTREVISION=	1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR database abstraction layer
 WWW=		https://pear.php.net/package/MDB2
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		pear
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/pear-MDB2/files/patch-MDB2.php b/databases/pear-MDB2/files/patch-MDB2.php
new file mode 100644
index 000000000000..a6f918aac6dd
--- /dev/null
+++ b/databases/pear-MDB2/files/patch-MDB2.php
@@ -0,0 +1,23 @@
+Obtained from:	https://github.com/pear/MDB2/commit/ee0563d1ac6ed2694c48701e24ed7c352edb6639
+
+--- MDB2.php.orig	2012-10-29 15:41:51 UTC
++++ MDB2.php
+@@ -575,7 +575,7 @@ class MDB2
+                          $dummy3 = false)
+     {
+         $pear = new PEAR;
+-        $err =& $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
++        $err = $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+         return $err;
+     }
+ 
+@@ -823,7 +823,8 @@ class MDB2
+             $parsed['dbsyntax'] = $str;
+         }
+ 
+-        if (!count($dsn)) {
++        $dsn = trim($dsn);
++        if (!strlen($dsn)) {
+             return $parsed;
+         }
+