diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index 3d230fe1b1ddb..1bbb6b8679b31 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/10/31 11:19:30 asau Exp $
+# $NetBSD: Makefile,v 1.3 2013/10/12 13:38:38 obache Exp $
 #
 
-DISTNAME=	funcparserlib-0.3.5
+DISTNAME=	funcparserlib-0.3.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://pypi.python.org/packages/source/f/funcparserlib/
@@ -13,5 +13,7 @@ LICENSE=	mit
 
 USE_LANGUAGES=	# none
 
-.include "../../lang/python/distutils.mk"
+PYTHON_VERSIONS_INCLUDE_3X=	yes
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-funcparserlib/PLIST b/devel/py-funcparserlib/PLIST
index c4a460dfa74ec..fcb27e97de404 100644
--- a/devel/py-funcparserlib/PLIST
+++ b/devel/py-funcparserlib/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/08 20:21:45 wiz Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2013/10/12 13:38:38 obache Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/funcparserlib/__init__.py
 ${PYSITELIB}/funcparserlib/__init__.pyc
 ${PYSITELIB}/funcparserlib/__init__.pyo
@@ -9,6 +12,24 @@ ${PYSITELIB}/funcparserlib/lexer.pyo
 ${PYSITELIB}/funcparserlib/parser.py
 ${PYSITELIB}/funcparserlib/parser.pyc
 ${PYSITELIB}/funcparserlib/parser.pyo
+${PYSITELIB}/funcparserlib/tests/__init__.py
+${PYSITELIB}/funcparserlib/tests/__init__.pyc
+${PYSITELIB}/funcparserlib/tests/__init__.pyo
+${PYSITELIB}/funcparserlib/tests/dot.py
+${PYSITELIB}/funcparserlib/tests/dot.pyc
+${PYSITELIB}/funcparserlib/tests/dot.pyo
+${PYSITELIB}/funcparserlib/tests/json.py
+${PYSITELIB}/funcparserlib/tests/json.pyc
+${PYSITELIB}/funcparserlib/tests/json.pyo
+${PYSITELIB}/funcparserlib/tests/test_dot.py
+${PYSITELIB}/funcparserlib/tests/test_dot.pyc
+${PYSITELIB}/funcparserlib/tests/test_dot.pyo
+${PYSITELIB}/funcparserlib/tests/test_json.py
+${PYSITELIB}/funcparserlib/tests/test_json.pyc
+${PYSITELIB}/funcparserlib/tests/test_json.pyo
+${PYSITELIB}/funcparserlib/tests/test_parsing.py
+${PYSITELIB}/funcparserlib/tests/test_parsing.pyc
+${PYSITELIB}/funcparserlib/tests/test_parsing.pyo
 ${PYSITELIB}/funcparserlib/util.py
 ${PYSITELIB}/funcparserlib/util.pyc
 ${PYSITELIB}/funcparserlib/util.pyo
diff --git a/devel/py-funcparserlib/distinfo b/devel/py-funcparserlib/distinfo
index 3f3df3da331a4..437f308aba927 100644
--- a/devel/py-funcparserlib/distinfo
+++ b/devel/py-funcparserlib/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/07/15 13:34:02 obache Exp $
+$NetBSD: distinfo,v 1.2 2013/10/12 13:38:38 obache Exp $
 
-SHA1 (funcparserlib-0.3.5.tar.gz) = 030a0689f5e7111ede49491f51e90fa641711fae
-RMD160 (funcparserlib-0.3.5.tar.gz) = 598f16e4a4a3b57c311898912b6e26058182c91e
-Size (funcparserlib-0.3.5.tar.gz) = 33117 bytes
+SHA1 (funcparserlib-0.3.6.tar.gz) = 6db0e9e78dcddd993cdd488945b040934a361f03
+RMD160 (funcparserlib-0.3.6.tar.gz) = 90ae4ce8eb4009fd1e4ba1a829ea0b37acc87cf1
+Size (funcparserlib-0.3.6.tar.gz) = 30401 bytes