diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile
index 4a9fe92715a2..c9af98d25782 100644
--- a/databases/py-pyPgSQL/Makefile
+++ b/databases/py-pyPgSQL/Makefile
@@ -5,19 +5,19 @@
 # $FreeBSD$
 #
 
-PORTNAME=      pyPgSQL
-PORTVERSION=   2.0
-CATEGORIES=    databases python
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pypgsql
-PKGNAMEPREFIX=  py-
-DISTNAME=      pypgsql-${PORTVERSION}
+PORTNAME=	pyPgSQL
+PORTVERSION=	2.1
+CATEGORIES=	databases python
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	pypgsql
+PKGNAMEPREFIX=	py-
+DISTNAME=	pypgsql-${PORTVERSION}
 
-MAINTAINER=    gerhard@bigfoot.de
+MAINTAINER=	gerhard@bigfoot.de
 
-BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-RUN_DEPENDS=   ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
-LIB_DEPENDS=   pq.2:${PORTSDIR}/databases/postgresql7
+BUILD_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
+RUN_DEPENDS=	${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base
+LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
 
 WRKSRC=		${WRKDIR}/pypgsql
 USE_PYTHON=	yes
@@ -32,7 +32,7 @@ DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
 DOCSDIR=	${PREFIX}/share/doc/py-pyPgSQL
 
 post-patch:
-	perl -i -p \
+	${PERL} -i -p \
 		-e 's#^include_dirs  = \[ "/usr/local/pgsql/include" \]#include_dirs  = [ "${LOCALBASE}/include" ]# ;' \
 		-e 's#^library_dirs  = \[ "/usr/local/pgsql/lib" \]#library_dirs  = [ "${LOCALBASE}/lib" ]#' \
 		${WRKSRC}/setup.py
@@ -41,7 +41,7 @@ post-patch:
 post-install:
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
-	@${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/databases/py-pyPgSQL/distinfo b/databases/py-pyPgSQL/distinfo
index 85ad9fbb9520..359c633ee705 100644
--- a/databases/py-pyPgSQL/distinfo
+++ b/databases/py-pyPgSQL/distinfo
@@ -1 +1 @@
-MD5 (pypgsql-2.0.tar.gz) = b3671864f8cddc5cfe89c4d1c365295a
+MD5 (pypgsql-2.1.tar.gz) = c7ec473a5bf64d0c2ee166d4dd2b42af
diff --git a/databases/py-pyPgSQL/pkg-plist b/databases/py-pyPgSQL/pkg-plist
index abd2cc2bf429..0c3291aa01d2 100644
--- a/databases/py-pyPgSQL/pkg-plist
+++ b/databases/py-pyPgSQL/pkg-plist
@@ -11,5 +11,4 @@
 %%PORTDOCS%%share/doc/py-pyPgSQL/README
 @dirrm %%PYTHON_SITELIBDIR%%/pyPgSQL/libpq
 @dirrm %%PYTHON_SITELIBDIR%%/pyPgSQL
-@dirrm %%PORTDOCS%%share/doc/py-pyPgSQL
-
+%%PORTDOCS%%@dirrm share/doc/py-pyPgSQL