diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 000dc6b824b77..efda6fa1e3c66 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:22 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/04/18 19:58:46 wiz Exp $
 
-DISTNAME=	psutil-1.2.1
+DISTNAME=	psutil-2.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://pypi.python.org/packages/source/p/psutil/
@@ -11,7 +11,7 @@ COMMENT=	Cross-platform process and system utilities module for Python
 LICENSE=	modified-bsd
 
 REPLACE_PYTHON=	psutil/*py
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 1.2.1
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.1.0
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/py-psutil/PLIST b/sysutils/py-psutil/PLIST
index 66945d6277d4c..11e9ef651b064 100644
--- a/sysutils/py-psutil/PLIST
+++ b/sysutils/py-psutil/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/07 21:25:23 richard Exp $
-${PYSITELIB}/_psutil_${LOWER_OPSYS}.so
+@comment $NetBSD: PLIST,v 1.3 2014/04/18 19:58:46 wiz Exp $
+${PYSITELIB}/_psutil_netbsd.so
 ${PYSITELIB}/_psutil_posix.so
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -14,18 +14,12 @@ ${PYSITELIB}/psutil/_common.pyo
 ${PYSITELIB}/psutil/_compat.py
 ${PYSITELIB}/psutil/_compat.pyc
 ${PYSITELIB}/psutil/_compat.pyo
-${PYSITELIB}/psutil/_error.py
-${PYSITELIB}/psutil/_error.pyc
-${PYSITELIB}/psutil/_error.pyo
 ${PYSITELIB}/psutil/_psbsd.py
 ${PYSITELIB}/psutil/_psbsd.pyc
 ${PYSITELIB}/psutil/_psbsd.pyo
 ${PYSITELIB}/psutil/_pslinux.py
 ${PYSITELIB}/psutil/_pslinux.pyc
 ${PYSITELIB}/psutil/_pslinux.pyo
-${PYSITELIB}/psutil/_psmswindows.py
-${PYSITELIB}/psutil/_psmswindows.pyc
-${PYSITELIB}/psutil/_psmswindows.pyo
 ${PYSITELIB}/psutil/_psnetbsd.py
 ${PYSITELIB}/psutil/_psnetbsd.pyc
 ${PYSITELIB}/psutil/_psnetbsd.pyo
@@ -38,6 +32,6 @@ ${PYSITELIB}/psutil/_psposix.pyo
 ${PYSITELIB}/psutil/_pssunos.py
 ${PYSITELIB}/psutil/_pssunos.pyc
 ${PYSITELIB}/psutil/_pssunos.pyo
-${PYSITELIB}/psutil/error.py
-${PYSITELIB}/psutil/error.pyc
-${PYSITELIB}/psutil/error.pyo
+${PYSITELIB}/psutil/_pswindows.py
+${PYSITELIB}/psutil/_pswindows.pyc
+${PYSITELIB}/psutil/_pswindows.pyo
diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
index 219a42d32c6d6..9419a503a0d72 100644
--- a/sysutils/py-psutil/distinfo
+++ b/sysutils/py-psutil/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.3 2013/12/07 21:25:23 richard Exp $
+$NetBSD: distinfo,v 1.4 2014/04/18 19:58:46 wiz Exp $
 
-SHA1 (psutil-1.2.1.tar.gz) = c8c1842bf1c63b9068ac25a37f7aae11fcecd57f
-RMD160 (psutil-1.2.1.tar.gz) = 5b014f73dce4035527886637ebd1b653e5a7faba
-Size (psutil-1.2.1.tar.gz) = 167397 bytes
+SHA1 (psutil-2.1.0.tar.gz) = 71d17148cfddfd620a93815f3a7e5195c24ea22a
+RMD160 (psutil-2.1.0.tar.gz) = 435b356e85e20daa8e84fe2e42485bd8b53d92d1
+Size (psutil-2.1.0.tar.gz) = 211640 bytes
 SHA1 (patch-psutil_____init____.py) = aa75a84992250e28db01d5fe13a68ed0cdcea883
 SHA1 (patch-psutil___psnetbsd.py) = 20089b57640a5eb30aeb1f5460624a570f1d3236
 SHA1 (patch-psutil___psutil__netbsd.c) = c251e097ce5c919537176f16406ad6892db955fc
 SHA1 (patch-psutil___psutil__netbsd.h) = 33e3c857f764d8391db747068ade7ea333698ec0
-SHA1 (patch-psutil___psutil__sunos.c) = 78bdb8103a10022785202873c7e60886a885340f
 SHA1 (patch-psutil_arch_netbsd_process__info.c) = c384d12cc47514d6396d779d59c586ef2b42a89a
 SHA1 (patch-psutil_arch_netbsd_process__info.h) = b23075df15749e4e5274ccb9e21d67ac55fdd199
 SHA1 (patch-setup.py) = 3e87561b6dfd7e851e232342dab3b2e8ade28cfd
-SHA1 (patch-test_test__psutil.py) = fa3ba09430f8ad307cf6674dee3e7cbfa9144e3b
+SHA1 (patch-test_test__psutil.py) = c521f4fa30b24cb86115370e52979c2c7f7af4a3
diff --git a/sysutils/py-psutil/patches/patch-test_test__psutil.py b/sysutils/py-psutil/patches/patch-test_test__psutil.py
index bf2f8d9764139..7bf9ddcac2556 100644
--- a/sysutils/py-psutil/patches/patch-test_test__psutil.py
+++ b/sysutils/py-psutil/patches/patch-test_test__psutil.py
@@ -1,12 +1,12 @@
-$NetBSD: patch-test_test__psutil.py,v 1.2 2013/12/07 21:25:24 richard Exp $
+$NetBSD: patch-test_test__psutil.py,v 1.3 2014/04/18 19:58:46 wiz Exp $
 
 Port to NetBSD.
 
---- test/test_psutil.py.orig	2013-11-22 21:26:42.000000000 +0000
+--- test/test_psutil.py.orig	2014-04-08 00:03:00.000000000 +0000
 +++ test/test_psutil.py
-@@ -77,7 +77,7 @@ POSIX = os.name == 'posix'
+@@ -87,7 +87,7 @@ if WINDOWS:
+     WIN_VISTA = (6, 0, 0)
  LINUX = sys.platform.startswith("linux")
- WINDOWS = sys.platform.startswith("win32")
  OSX = sys.platform.startswith("darwin")
 -BSD = sys.platform.startswith("freebsd")
 +BSD = sys.platform.startswith("freebsd") or sys.platform.startswith("netbsd")