diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index 79b410daf8ee..bd322226b978 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -11,29 +11,22 @@ COMMENT=	Command line tools for the Google Data APIs
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gdata/__init__.py:${PORTSDIR}/devel/py-gdata
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-
-.if !defined(NO_INSTALL_MANPAGES)
-MAN1=		google.1
-.endif
+USE_PYDISTUTILS=yes
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NO_INSTALL_MANPAGES)
-	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MANPREFIX}/man/man1
-.endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.* ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.* ${STAGEDIR}${DOCSDIR}
 .endif
+	${INSTALL_MAN} ${WRKSRC}/man/google.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/net/googlecl/pkg-plist b/net/googlecl/pkg-plist
index cfb589932d9e..73231e9da6fd 100644
--- a/net/googlecl/pkg-plist
+++ b/net/googlecl/pkg-plist
@@ -1,4 +1,5 @@
 bin/google
+man/man1/google.1.gz
 %%PYTHON_SITELIBDIR%%/googlecl/__init__.py
 %%PYTHON_SITELIBDIR%%/googlecl/__init__.pyc
 %%PYTHON_SITELIBDIR%%/googlecl/__init__.pyo