diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile
index d1ec72d354ada..c3e3ecb0bb34d 100644
--- a/databases/pear-DB_DataObject/Makefile
+++ b/databases/pear-DB_DataObject/Makefile
@@ -11,19 +11,20 @@ COMMENT=	SQL Builder, Object Interface to Database Tables
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/docs/LICENCE.txt
 
-BUILD_DEPENDS=	${PEAR_PKGNAMEPREFIX}DB>=1.9.3:databases/pear-DB@${PHP_FLAVOR} \
-		${PEAR_PKGNAMEPREFIX}Date>=1.4.7:devel/pear-Date@${PHP_FLAVOR}
-RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}DB>=1.9.3:databases/pear-DB@${PHP_FLAVOR} \
-		${PEAR_PKGNAMEPREFIX}Date>=1.4.7:devel/pear-Date@${PHP_FLAVOR}
+RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
 
 USES=		pear
 
-OPTIONS_DEFINE=	PEAR_MDB2 PEAR_VALIDATE
+NO_ARCH=	yes
 
-PEAR_MDB2_DESC=		PEAR::MDB2 support
-PEAR_VALIDATE_DESC=	PEAR::Validate support
+OPTIONS_DEFINE=	DB MDB2 VALIDATE
+OPTIONS_DEFAULT=DB
+DB_DESC=	DB support
+MDB2_DESC=	MDB2 support
+VALIDATE_DESC=	Validate support
 
-PEAR_MDB2_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=2.5.0.b5:databases/pear-MDB2@${PHP_FLAVOR}
-PEAR_VALIDATE_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.8.5:devel/pear-Validate@${PHP_FLAVOR}
+DB_RUN_DEPENDS=		${PEAR_PKGNAMEPREFIX}DB>=1.7.0:databases/pear-DB@${PHP_FLAVOR}
+MDB2_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}MDB2>=2.0.0.r1:databases/pear-MDB2@${PHP_FLAVOR}
+VALIDATE_RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Validate>=0.1.1:devel/pear-Validate@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/pear-DB_DataObject/pkg-descr b/databases/pear-DB_DataObject/pkg-descr
index 1974d857719c1..e09c9e08a401b 100644
--- a/databases/pear-DB_DataObject/pkg-descr
+++ b/databases/pear-DB_DataObject/pkg-descr
@@ -1,8 +1,9 @@
-PEAR::DB_DataObject performs 2 tasks:
+DataObject performs 2 tasks:
 1. Builds SQL statements based on the objects vars and the builder methods.
 2. acts as a datastore for a table row.
+
 The core class is designed to be extended for each of your tables so that you
-put the data logic inside the data classes.
-included is a Generator to make your configuration files and your base classes.
+put the data logic inside the data classes. A generator is included to make your
+configuration files and your base classes.
 
 WWW: https://pear.php.net/package/DB_DataObject