diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile
index 5f1be3f01fda4..a80527cc0d74b 100644
--- a/security/py-keyring/Makefile
+++ b/security/py-keyring/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2014/03/26 10:28:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/31 08:29:11 wiz Exp $
 
-DISTNAME=	keyring-0.5.1
-PKGNAME=	${PYPKGPREFIX}-keyring-0.5.1
+DISTNAME=	keyring-3.7
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security
 MASTER_SITES=	http://pypi.python.org/packages/source/k/keyring/
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc.gnome@gmail.com
 HOMEPAGE=	https://pypi.python.org/pypi/keyring
 COMMENT=	Store and access your passwords safely
 LICENSE=	python-software-foundation
 
-PYDISTUTILSPKG= yes
-PYTHON_VERSIONS_INCOMPATIBLE=	33
+REPLACE_PYTHON+=	keyring/cli.py
 
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-keyring/PLIST b/security/py-keyring/PLIST
index 52a7fe7dca848..e872a26005ef2 100644
--- a/security/py-keyring/PLIST
+++ b/security/py-keyring/PLIST
@@ -1,34 +1,143 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/14 17:27:04 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/03/31 08:29:11 wiz Exp $
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/keyring/__init__.py
 ${PYSITELIB}/keyring/__init__.pyc
 ${PYSITELIB}/keyring/__init__.pyo
 ${PYSITELIB}/keyring/backend.py
 ${PYSITELIB}/keyring/backend.pyc
 ${PYSITELIB}/keyring/backend.pyo
+${PYSITELIB}/keyring/backends/Gnome.py
+${PYSITELIB}/keyring/backends/Gnome.pyc
+${PYSITELIB}/keyring/backends/Gnome.pyo
+${PYSITELIB}/keyring/backends/Google.py
+${PYSITELIB}/keyring/backends/Google.pyc
+${PYSITELIB}/keyring/backends/Google.pyo
+${PYSITELIB}/keyring/backends/OS_X.py
+${PYSITELIB}/keyring/backends/OS_X.pyc
+${PYSITELIB}/keyring/backends/OS_X.pyo
+${PYSITELIB}/keyring/backends/SecretService.py
+${PYSITELIB}/keyring/backends/SecretService.pyc
+${PYSITELIB}/keyring/backends/SecretService.pyo
+${PYSITELIB}/keyring/backends/Windows.py
+${PYSITELIB}/keyring/backends/Windows.pyc
+${PYSITELIB}/keyring/backends/Windows.pyo
 ${PYSITELIB}/keyring/backends/__init__.py
 ${PYSITELIB}/keyring/backends/__init__.pyc
 ${PYSITELIB}/keyring/backends/__init__.pyo
+${PYSITELIB}/keyring/backends/_win_crypto.py
+${PYSITELIB}/keyring/backends/_win_crypto.pyc
+${PYSITELIB}/keyring/backends/_win_crypto.pyo
+${PYSITELIB}/keyring/backends/file.py
+${PYSITELIB}/keyring/backends/file.pyc
+${PYSITELIB}/keyring/backends/file.pyo
+${PYSITELIB}/keyring/backends/keyczar.py
+${PYSITELIB}/keyring/backends/keyczar.pyc
+${PYSITELIB}/keyring/backends/keyczar.pyo
+${PYSITELIB}/keyring/backends/kwallet.py
+${PYSITELIB}/keyring/backends/kwallet.pyc
+${PYSITELIB}/keyring/backends/kwallet.pyo
+${PYSITELIB}/keyring/backends/multi.py
+${PYSITELIB}/keyring/backends/multi.pyc
+${PYSITELIB}/keyring/backends/multi.pyo
+${PYSITELIB}/keyring/backends/pyfs.py
+${PYSITELIB}/keyring/backends/pyfs.pyc
+${PYSITELIB}/keyring/backends/pyfs.pyo
+${PYSITELIB}/keyring/cli.py
+${PYSITELIB}/keyring/cli.pyc
+${PYSITELIB}/keyring/cli.pyo
 ${PYSITELIB}/keyring/core.py
 ${PYSITELIB}/keyring/core.pyc
 ${PYSITELIB}/keyring/core.pyo
+${PYSITELIB}/keyring/credentials.py
+${PYSITELIB}/keyring/credentials.pyc
+${PYSITELIB}/keyring/credentials.pyo
+${PYSITELIB}/keyring/errors.py
+${PYSITELIB}/keyring/errors.pyc
+${PYSITELIB}/keyring/errors.pyo
 ${PYSITELIB}/keyring/getpassbackend.py
 ${PYSITELIB}/keyring/getpassbackend.pyc
 ${PYSITELIB}/keyring/getpassbackend.pyo
+${PYSITELIB}/keyring/http.py
+${PYSITELIB}/keyring/http.pyc
+${PYSITELIB}/keyring/http.pyo
+${PYSITELIB}/keyring/py27compat.py
+${PYSITELIB}/keyring/py27compat.pyc
+${PYSITELIB}/keyring/py27compat.pyo
 ${PYSITELIB}/keyring/tests/__init__.py
 ${PYSITELIB}/keyring/tests/__init__.pyc
 ${PYSITELIB}/keyring/tests/__init__.pyo
+${PYSITELIB}/keyring/tests/backends/__init__.py
+${PYSITELIB}/keyring/tests/backends/__init__.pyc
+${PYSITELIB}/keyring/tests/backends/__init__.pyo
+${PYSITELIB}/keyring/tests/backends/test_Gnome.py
+${PYSITELIB}/keyring/tests/backends/test_Gnome.pyc
+${PYSITELIB}/keyring/tests/backends/test_Gnome.pyo
+${PYSITELIB}/keyring/tests/backends/test_Google.py
+${PYSITELIB}/keyring/tests/backends/test_Google.pyc
+${PYSITELIB}/keyring/tests/backends/test_Google.pyo
+${PYSITELIB}/keyring/tests/backends/test_OS_X.py
+${PYSITELIB}/keyring/tests/backends/test_OS_X.pyc
+${PYSITELIB}/keyring/tests/backends/test_OS_X.pyo
+${PYSITELIB}/keyring/tests/backends/test_SecretService.py
+${PYSITELIB}/keyring/tests/backends/test_SecretService.pyc
+${PYSITELIB}/keyring/tests/backends/test_SecretService.pyo
+${PYSITELIB}/keyring/tests/backends/test_Windows.py
+${PYSITELIB}/keyring/tests/backends/test_Windows.pyc
+${PYSITELIB}/keyring/tests/backends/test_Windows.pyo
+${PYSITELIB}/keyring/tests/backends/test_crypto.py
+${PYSITELIB}/keyring/tests/backends/test_crypto.pyc
+${PYSITELIB}/keyring/tests/backends/test_crypto.pyo
+${PYSITELIB}/keyring/tests/backends/test_file.py
+${PYSITELIB}/keyring/tests/backends/test_file.pyc
+${PYSITELIB}/keyring/tests/backends/test_file.pyo
+${PYSITELIB}/keyring/tests/backends/test_keyczar.py
+${PYSITELIB}/keyring/tests/backends/test_keyczar.pyc
+${PYSITELIB}/keyring/tests/backends/test_keyczar.pyo
+${PYSITELIB}/keyring/tests/backends/test_kwallet.py
+${PYSITELIB}/keyring/tests/backends/test_kwallet.pyc
+${PYSITELIB}/keyring/tests/backends/test_kwallet.pyo
+${PYSITELIB}/keyring/tests/backends/test_multi.py
+${PYSITELIB}/keyring/tests/backends/test_multi.pyc
+${PYSITELIB}/keyring/tests/backends/test_multi.pyo
+${PYSITELIB}/keyring/tests/backends/test_pyfs.py
+${PYSITELIB}/keyring/tests/backends/test_pyfs.pyc
+${PYSITELIB}/keyring/tests/backends/test_pyfs.pyo
+${PYSITELIB}/keyring/tests/mocks.py
+${PYSITELIB}/keyring/tests/mocks.pyc
+${PYSITELIB}/keyring/tests/mocks.pyo
+${PYSITELIB}/keyring/tests/py30compat.py
+${PYSITELIB}/keyring/tests/py30compat.pyc
+${PYSITELIB}/keyring/tests/py30compat.pyo
+${PYSITELIB}/keyring/tests/test_XDG.py
+${PYSITELIB}/keyring/tests/test_XDG.pyc
+${PYSITELIB}/keyring/tests/test_XDG.pyo
 ${PYSITELIB}/keyring/tests/test_backend.py
 ${PYSITELIB}/keyring/tests/test_backend.pyc
 ${PYSITELIB}/keyring/tests/test_backend.pyo
+${PYSITELIB}/keyring/tests/test_cli.py
+${PYSITELIB}/keyring/tests/test_cli.pyc
+${PYSITELIB}/keyring/tests/test_cli.pyo
 ${PYSITELIB}/keyring/tests/test_core.py
 ${PYSITELIB}/keyring/tests/test_core.pyc
 ${PYSITELIB}/keyring/tests/test_core.pyo
 ${PYSITELIB}/keyring/tests/test_util.py
 ${PYSITELIB}/keyring/tests/test_util.pyc
 ${PYSITELIB}/keyring/tests/test_util.pyo
+${PYSITELIB}/keyring/tests/util.py
+${PYSITELIB}/keyring/tests/util.pyc
+${PYSITELIB}/keyring/tests/util.pyo
+${PYSITELIB}/keyring/util/XDG.py
+${PYSITELIB}/keyring/util/XDG.pyc
+${PYSITELIB}/keyring/util/XDG.pyo
 ${PYSITELIB}/keyring/util/__init__.py
 ${PYSITELIB}/keyring/util/__init__.pyc
 ${PYSITELIB}/keyring/util/__init__.pyo
 ${PYSITELIB}/keyring/util/escape.py
 ${PYSITELIB}/keyring/util/escape.pyc
 ${PYSITELIB}/keyring/util/escape.pyo
+${PYSITELIB}/keyring/util/platform_.py
+${PYSITELIB}/keyring/util/platform_.pyc
+${PYSITELIB}/keyring/util/platform_.pyo
+${PYSITELIB}/keyring/util/properties.py
+${PYSITELIB}/keyring/util/properties.pyc
+${PYSITELIB}/keyring/util/properties.pyo
diff --git a/security/py-keyring/distinfo b/security/py-keyring/distinfo
index c523fa217c369..e7e4a47df726b 100644
--- a/security/py-keyring/distinfo
+++ b/security/py-keyring/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/04/14 17:27:04 drochner Exp $
+$NetBSD: distinfo,v 1.2 2014/03/31 08:29:11 wiz Exp $
 
-SHA1 (keyring-0.5.1.tar.gz) = f7b9005313a24c4a00a295efcba4f9b2c1085f26
-RMD160 (keyring-0.5.1.tar.gz) = 950eeae68f5aa4605d42e091a24872ff24d7ad4d
-Size (keyring-0.5.1.tar.gz) = 17928 bytes
+SHA1 (keyring-3.7.zip) = fa793a575d1d3b84780cd6cb69efcd0396a1d596
+RMD160 (keyring-3.7.zip) = adae84c76f20da3ef7df146b591bbc94d3368c75
+Size (keyring-3.7.zip) = 89249 bytes