diff --git a/geography/py-obspy/Makefile b/geography/py-obspy/Makefile
index a63fe7d43ef8a..0c07c6101ac42 100644
--- a/geography/py-obspy/Makefile
+++ b/geography/py-obspy/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2016/08/07 10:36:43 wen Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/20 18:56:55 richard Exp $
 
 DISTNAME=	obspy-1.0.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	geography python
 MASTER_SITES=	${MASTER_SITE_PYPI:=o/obspy/}
 EXTRACT_SUFX=	.zip
 
-MAINTAINER=	wen@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.obspy.org/
 COMMENT=	Python framework for seismological observatories
 LICENSE=	gnu-lgpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
-DEPENDS+=	${PYPKGPREFIX}-suds>=0.4:../../net/py-suds
 DEPENDS+=	${PYPKGPREFIX}-lxml>=3.2.3:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-future>=0.12.4:../../devel/py-future
 DEPENDS+=	${PYPKGPREFIX}-requests>=0:../../devel/py-requests
@@ -24,12 +24,19 @@ USE_TOOLS+=	bash:run
 
 REPLACE_BASH=	obspy/taup/tests/data/TauP_test_data/gendata.sh
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-suds
-
 pre-configure:
 	${FIND} ${WRKSRC} -type f -exec ${CHMOD} -x {} \;
 
+.include "../../lang/python/pyversion.mk"
+
+PYPLATFORM!=	${PYTHONBIN} -c 'import platform; print platform.system() + "_" + platform.architecture()[0]'
+
+PLIST_SUBST+=		PYPLATFORM=${PYPLATFORM} PYPKGPREFIX=${PYPKGPREFIX}
+PRINT_PLIST_AWK+=       /^${PYPLATFORM:S|/|\\/|g}/ \
+                        { gsub(/${PYPLATFORM:S|/|\\/|g}/, "$${PYPLATFORM}") }
+
 .include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
+.include "../../lang/python/tool.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/geography/py-obspy/PLIST b/geography/py-obspy/PLIST
index 906486563f1cc..f8cd61635a719 100644
--- a/geography/py-obspy/PLIST
+++ b/geography/py-obspy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/08/07 10:36:43 wen Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/20 18:56:55 richard Exp $
 bin/obspy-dataless2resp
 bin/obspy-dataless2xseed
 bin/obspy-flinn-engdahl
@@ -12,14 +12,14 @@ bin/obspy-runtests
 bin/obspy-scan
 bin/obspy-sds-report
 bin/obspy-xseed2dataless
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/namespace_packages.txt
-${PYSITELIB}/${EGG_FILE}/not-zip-safe
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/namespace_packages.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/obspy/CONTRIBUTORS.txt
 ${PYSITELIB}/obspy/LICENSE.txt
 ${PYSITELIB}/obspy/RELEASE-VERSION
@@ -1610,12 +1610,12 @@ ${PYSITELIB}/obspy/io/zmap/tests/test_zmap.pyo
 ${PYSITELIB}/obspy/lib/__init__.py
 ${PYSITELIB}/obspy/lib/__init__.pyc
 ${PYSITELIB}/obspy/lib/__init__.pyo
-${PYSITELIB}/obspy/lib/libevresp_NetBSD_64bit_py27.so
-${PYSITELIB}/obspy/lib/libgse2_NetBSD_64bit_py27.so
-${PYSITELIB}/obspy/lib/libmseed_NetBSD_64bit_py27.so
-${PYSITELIB}/obspy/lib/libsegy_NetBSD_64bit_py27.so
-${PYSITELIB}/obspy/lib/libsignal_NetBSD_64bit_py27.so
-${PYSITELIB}/obspy/lib/libtau_NetBSD_64bit_py27.so
+${PYSITELIB}/obspy/lib/libevresp_${PYPLATFORM}_${PYPKGPREFIX}.so
+${PYSITELIB}/obspy/lib/libgse2_${PYPLATFORM}_${PYPKGPREFIX}.so
+${PYSITELIB}/obspy/lib/libmseed_${PYPLATFORM}_${PYPKGPREFIX}.so
+${PYSITELIB}/obspy/lib/libsegy_${PYPLATFORM}_${PYPKGPREFIX}.so
+${PYSITELIB}/obspy/lib/libsignal_${PYPLATFORM}_${PYPKGPREFIX}.so
+${PYSITELIB}/obspy/lib/libtau_${PYPLATFORM}_${PYPKGPREFIX}.so
 ${PYSITELIB}/obspy/realtime/README.txt
 ${PYSITELIB}/obspy/realtime/__init__.py
 ${PYSITELIB}/obspy/realtime/__init__.pyc