diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index a805c496ee89..82301c131770 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -5,18 +5,23 @@ PORTNAME=	pxtools
 PORTVERSION=	0.0.20
 PORTREVISION=	4
 CATEGORIES=	databases
-MASTER_SITES=	http://jan.kneschke.de/downloads/pxtools/ \
-		http://www.sourcefiles.org/Databases/Utilities/Conversion/
+MASTER_SITES=	http://jan.kneschke.de/downloads/pxtools/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Collection of tools to work with Paradox databases
 
 LICENSE=	GPLv2
 
-USES=		gettext
+USES=		gettext localbase
 GNU_CONFIGURE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	Y2K
+Y2K_DESC=	Y2k workaround for Paradox < 7.0
+
+Y2K_CONFIGURE_ON=	--enable-y2k
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,void \*ptr,int ptr,' \
+		${WRKSRC}/src/pxparse.c
 
 .include <bsd.port.mk>
diff --git a/databases/pxtools/pkg-descr b/databases/pxtools/pkg-descr
index 068bf290e1d0..6acba2f272cf 100644
--- a/databases/pxtools/pkg-descr
+++ b/databases/pxtools/pkg-descr
@@ -5,6 +5,6 @@ pxtools consists of the following:
   the important information.
 * pxsqldump/pxcsvdump are utilities to extract the data from a
   Paradox-database.  The output is an SQL-/CSV-dump that can be
-  used to recreate the database in an SQL-enviroment.
+  used to recreate the database in an SQL environment.
 
 WWW: http://jan.kneschke.de/projects/pxtools/