diff --git a/astro/weather/Makefile b/astro/weather/Makefile
index 64bf2765612a..d17896b538ce 100644
--- a/astro/weather/Makefile
+++ b/astro/weather/Makefile
@@ -1,50 +1,39 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
 
 PORTNAME=	weather
 PORTVERSION=	2.4.1
 CATEGORIES=	astro python
 MASTER_SITES=	http://fungi.yuggoth.org/weather/src/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utility to provide current weather conditions and forecasts
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python shebangfix tar:xz
 
 NO_ARCH=	yes
-
-PLIST_FILES=	bin/weather \
-		${PYTHON_SITELIBDIR}/weather.py \
-		${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc \
-		${PYTHON_SITELIBDIR}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.opt-1.pyc \
-		share/man/man1/weather.1.gz \
-		share/man/man5/weatherrc.5.gz
-PORTDATA=	airports places stations zctas zones
+NO_BUILD=	yes
 
 SHEBANG_FILES=	weather
 
-do-build:
-	@${PYTHON_CMD} -m compileall ${WRKSRC}/weather.py
-	@${PYTHON_CMD} -O -m compileall ${WRKSRC}/weather.py
-
 do-install:
-	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
+	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/weather ${STAGEDIR}${PREFIX}/bin/weather
 	${INSTALL_DATA} ${WRKSRC}/weather.py ${STAGEDIR}${PYTHON_SITELIBDIR}/
-	${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
-	${INSTALL_DATA} ${WRKSRC}/__pycache__/weather.cpython-${PYTHON_SUFFIX}.opt-1.pyc ${STAGEDIR}${PYTHON_SITELIBDIR}/__pycache__/
+	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
+	${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_MAN} ${WRKSRC}/weather.1 ${STAGEDIR}${PREFIX}/share/man/man1/weather.1
 	${INSTALL_MAN} ${WRKSRC}/weatherrc.5 ${STAGEDIR}${PREFIX}/share/man/man5/weatherrc.5
 	${MKDIR} ${STAGEDIR}${DATADIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} airports places stations zctas zones ${STAGEDIR}${DATADIR}/
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Please add the following to your .weatherrc in order to use installed data files:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "[default]"
 	@${ECHO_MSG} "setpath = ${DATADIR}"
 	@${ECHO_MSG} ""
 
 .include <bsd.port.mk>
diff --git a/astro/weather/pkg-plist b/astro/weather/pkg-plist
new file mode 100644
index 000000000000..7879168c4817
--- /dev/null
+++ b/astro/weather/pkg-plist
@@ -0,0 +1,11 @@
+bin/weather
+%%PYTHON_SITELIBDIR%%/weather.py
+%%PYTHON_SITELIBDIR%%/__pycache__/weather.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/__pycache__/weather.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+share/man/man1/weather.1.gz
+share/man/man5/weatherrc.5.gz
+%%DATADIR%%/airports
+%%DATADIR%%/places
+%%DATADIR%%/stations
+%%DATADIR%%/zctas
+%%DATADIR%%/zones