diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 494f6c7cccc9..6421b34634fd 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	pypy
-DISTVERSION=	2.2.1
-PORTREVISION=	1
+DISTVERSION=	2.3.1
 CATEGORIES=	lang python
-MASTER_SITES=	http://cdn.bitbucket.org/pypy/pypy/downloads/ https://bitbucket.org/pypy/pypy/downloads/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-src
+MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy
+DISTNAME=	release-${DISTVERSION}
+DIST_SUBDIR=	pypy
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Fast, compliant implementation of the Python language
@@ -35,15 +35,15 @@ OPTIONS_SINGLE_TRANS=	PYTHON PYPY PYPY_MINMEM
 OPTIONS_DEFAULT+=	PYPY_MINMEM
 .endif
 
-CONFLICTS_INSTALL=	pypy-devel-[0-9]*
+CONFLICTS_INSTALL=	pypy-[0-9]*
 
 ALL_TARGET=	${PYPY_NAMES}
 BUILD_WRKSRC=	${WRKDIR}
-DATE=		20130810
 USES=		compiler:c11 gettext iconv tar:bzip2
 MAKEFILE=	${FILESDIR}/Makefile
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+WRKSRC=		${WRKDIR}/pypy-pypy-32f35069a16d
 
 PYPY_VER=	${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
 PYTHON_IMPL_VER=	2.7
@@ -59,9 +59,6 @@ PLIST_SUB+=	PYPY_LIBDIR=${PYPY_LIBDIR} \
 MAKE_ENV+=	DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \
 		WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
 
-LOCALBASE_REFIX=	\
-		lib_pypy/_sqlite3.py
-
 .include <bsd.port.options.mk>
 .include "${MASTERDIR}/files/bsd.pypy.inst.mk"
 
@@ -228,11 +225,6 @@ post-extract:
 .endfor
 	${LN} -s ${WRKDIR}/lib ${WRKSRC}/lib
 
-post-patch:
-.for file in ${LOCALBASE_REFIX}
-	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/${file}
-.endfor
-
 do-configure:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 		-e 's|%%PYPY_NAMES%%|${PYPY_NAMES}|g' \
@@ -244,7 +236,7 @@ do-configure:
 post-build:
 # UPDATING: check pypy/tool/release/package.py for list of cffi modules
 .for mod in _sqlite3 _curses syslog
-	${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}'
+	${SETENV} ${MAKE_ENV} ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}'
 .endfor
 	${STRIP_CMD} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/__pycache__/_cffi__*.pypy-${PYPY_VER:C/\.//}.so
 .for _path in ${PYPYDIRS}
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 8708331f0b00..a3a5227ec8aa 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pypy-2.2.1-src.tar.bz2) = 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f
-SIZE (pypy-2.2.1-src.tar.bz2) = 14439822
+SHA256 (pypy/release-2.3.1.tar.bz2) = 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439
+SIZE (pypy/release-2.3.1.tar.bz2) = 15225332
diff --git a/lang/pypy/files/Makefile b/lang/pypy/files/Makefile
index 0c6f65358d3e..72864a68e029 100644
--- a/lang/pypy/files/Makefile
+++ b/lang/pypy/files/Makefile
@@ -21,7 +21,7 @@ TOUCH?=		touch
 
 REINPLACE_CMD?=	${SED} -i~
 
-BUILDDIR=	usession-release-${DISTVERSION:C/.[0-9]*$//}.x-0
+BUILDDIR=	usession-release-${DISTVERSION}-0
 
 .for inst in ${PYPY_INST}
 
diff --git a/lang/pypy/files/patch-lib-python__2.7__sysconfig.py b/lang/pypy/files/patch-lib-python__2.7__sysconfig.py
index e96cc0e2e8af..6c0aa5c28d4b 100644
--- a/lang/pypy/files/patch-lib-python__2.7__sysconfig.py
+++ b/lang/pypy/files/patch-lib-python__2.7__sysconfig.py
@@ -12,8 +12,8 @@
 -        'platinclude': '{base}/include',
 +        'stdlib': '{base}/lib/pypy-{pypy_version_short}',
 +        'platstdlib': '{platbase}/lib/pypy-{pypy_version_short}',
-+        'purelib': '{base}/lib/pypy-{pypy_version_short}',
-+        'platlib': '{platbase}/lib/pypy-{pypy_version_short}',
++        'purelib': '{base}/lib/pypy-{pypy_version_short}/site-packages',
++        'platlib': '{platbase}/lib/pypy-{pypy_version_short}/site-packages',
 +        'include': '{base}/include/pypy-{pypy_version_short}',
 +        'platinclude': '{platbase}/include/pypy-{pypy_version_short}',
          'scripts': '{base}/bin',
@@ -32,7 +32,7 @@
          _CONFIG_VARS['py_version'] = _PY_VERSION
          _CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT
          _CONFIG_VARS['py_version_nodot'] = _PY_VERSION[0] + _PY_VERSION[2]
-+        _CONFIG_VARS['py_version'] = _PYPY_VERSION
++        _CONFIG_VARS['pypy_version'] = _PYPY_VERSION
 +        _CONFIG_VARS['pypy_version_short'] = _PYPY_VERSION_SHORT
 +        _CONFIG_VARS['pypy_version_nodot'] = _PYPY_VERSION[0] + _PYPY_VERSION[2]
          _CONFIG_VARS['base'] = _PREFIX
diff --git a/lang/pypy/files/patch-lib_pypy___sqlite3.py b/lang/pypy/files/patch-lib_pypy___sqlite3.py
index 6cb5a0c53265..5a8650d0f7b6 100644
--- a/lang/pypy/files/patch-lib_pypy___sqlite3.py
+++ b/lang/pypy/files/patch-lib_pypy___sqlite3.py
@@ -1,11 +1,19 @@
---- lib_pypy/_sqlite3.py.orig	2013-05-18 16:20:00.000000000 +0200
-+++ lib_pypy/_sqlite3.py	2013-05-18 16:21:06.000000000 +0200
-@@ -270,7 +270,7 @@
+--- lib_pypy/_sqlite3.py.bak	2013-12-15 23:45:52.000000000 +0200
++++ lib_pypy/_sqlite3.py	2013-12-16 12:07:57.000000000 +0200
+@@ -269,11 +269,14 @@
+     _ffi.cdef("int sqlite3_enable_load_extension(sqlite3 *db, int onoff);")
  
- _lib = _ffi.verify("""
- #include <sqlite3.h>
--""", libraries=['sqlite3']
-+""", libraries=['sqlite3'], include_dirs=['/usr/local/include'], library_dirs=['/usr/local/lib']
- )
- 
- exported_sqlite_symbols = [
+ if sys.platform.startswith('freebsd'):
++    import os
++    import os.path
++    _localbase = os.environ.get('LOCALBASE', '/usr/local')
+     _lib = _ffi.verify("""
+     #include <sqlite3.h>
+     """, libraries=['sqlite3'],
+-         include_dirs=['/usr/local/include'],
+-         library_dirs=['/usr/local/lib']
++         include_dirs=[os.path.join(_localbase, 'include')],
++         library_dirs=[os.path.join(_localbase, 'lib')]
+     )
+ else:
+     _lib = _ffi.verify("""
diff --git a/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py b/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
index ec8cfbdc0b18..3775d6ac9e59 100644
--- a/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
+++ b/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
@@ -1,9 +1,9 @@
---- pypy/sandbox/pypy_interact.py.orig	2012-06-07 14:24:48.000000000 +0200
-+++ pypy/sandbox/pypy_interact.py	2012-07-02 21:08:19.000000000 +0200
+--- pypy/sandbox/pypy_interact.py.orig	2014-05-08 18:36:08.000000000 +0200
++++ pypy/sandbox/pypy_interact.py	2014-05-12 20:20:57.000000000 +0200
 @@ -22,11 +22,14 @@
  
  import sys, os
- sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..', '..')))
+ sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '..', '..')))
 +from pypy.module.sys.version import PYPY_VERSION
  from rpython.translator.sandbox.sandlib import SimpleIOSandboxedProc
  from rpython.translator.sandbox.sandlib import VirtualizedSandboxedProc
diff --git a/lang/pypy/pkg-descr b/lang/pypy/pkg-descr
index 036119c013df..9978da98d6d5 100644
--- a/lang/pypy/pkg-descr
+++ b/lang/pypy/pkg-descr
@@ -14,4 +14,4 @@ PyPy is a fast, compliant alternative implementation of the Python language
               micro-threads for massive concurrency.
  - As well as other features.
 
-WWW: http://pypy.org/
+WWW: http://pypy.org
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index 16b5d87a3229..518fc865e782 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -1,3 +1,4 @@
+%%PYPY_INCLUDEDIR%%/PyPy.h
 %%PYPY_INCLUDEDIR%%/Python.h
 %%PYPY_INCLUDEDIR%%/README
 %%PYPY_INCLUDEDIR%%/abstract.h
@@ -92,6 +93,8 @@
 %%PYPY_LIBDIR%%/__phello__.foo.pyc
 %%PYPY_LIBDIR%%/_abcoll.py
 %%PYPY_LIBDIR%%/_abcoll.pyc
+%%PYPY_LIBDIR%%/_osx_support.py
+%%PYPY_LIBDIR%%/_osx_support.pyc
 %%PYPY_LIBDIR%%/_pyio.py
 %%PYPY_LIBDIR%%/_pyio.pyc
 %%PYPY_LIBDIR%%/_strptime.py
@@ -371,6 +374,8 @@
 %%PYPY_LIBDIR%%/ctypes/test/test_varsize_struct.pyc
 %%PYPY_LIBDIR%%/ctypes/test/test_win32.py
 %%PYPY_LIBDIR%%/ctypes/test/test_win32.pyc
+%%PYPY_LIBDIR%%/ctypes/test/test_wintypes.py
+%%PYPY_LIBDIR%%/ctypes/test/test_wintypes.pyc
 %%PYPY_LIBDIR%%/ctypes/util.py
 %%PYPY_LIBDIR%%/ctypes/util.pyc
 %%PYPY_LIBDIR%%/ctypes/wintypes.py
@@ -1123,6 +1128,35 @@
 %%PYPY_LIBDIR%%/idlelib/idle.py
 %%PYPY_LIBDIR%%/idlelib/idle.pyc
 %%PYPY_LIBDIR%%/idlelib/idle.pyw
+%%PYPY_LIBDIR%%/idlelib/idle_test/README.txt
+%%PYPY_LIBDIR%%/idlelib/idle_test/__init__.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/__init__.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/mock_idle.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/mock_idle.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/mock_tk.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/mock_tk.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_calltips.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_calltips.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_config_name.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_config_name.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_delegator.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_delegator.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_formatparagraph.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_formatparagraph.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_grep.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_grep.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_idlehistory.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_idlehistory.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_pathbrowser.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_pathbrowser.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_rstrip.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_rstrip.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_searchengine.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_searchengine.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_text.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_text.pyc
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_warning.py
+%%PYPY_LIBDIR%%/idlelib/idle_test/test_warning.pyc
 %%PYPY_LIBDIR%%/idlelib/idlever.py
 %%PYPY_LIBDIR%%/idlelib/idlever.pyc
 %%PYPY_LIBDIR%%/idlelib/keybindingDialog.py
@@ -1193,6 +1227,8 @@
 %%PYPY_LIBDIR%%/json/tests/test_separators.pyc
 %%PYPY_LIBDIR%%/json/tests/test_speedups.py
 %%PYPY_LIBDIR%%/json/tests/test_speedups.pyc
+%%PYPY_LIBDIR%%/json/tests/test_tool.py
+%%PYPY_LIBDIR%%/json/tests/test_tool.pyc
 %%PYPY_LIBDIR%%/json/tests/test_unicode.py
 %%PYPY_LIBDIR%%/json/tests/test_unicode.pyc
 %%PYPY_LIBDIR%%/json/tool.py
@@ -1411,6 +1447,8 @@
 %%PYPY_LIBDIR%%/lib2to3/tests/data/crlf.pyc
 %%PYPY_LIBDIR%%/lib2to3/tests/data/different_encoding.py
 %%PYPY_LIBDIR%%/lib2to3/tests/data/different_encoding.pyc
+%%PYPY_LIBDIR%%/lib2to3/tests/data/false_encoding.py
+%%PYPY_LIBDIR%%/lib2to3/tests/data/false_encoding.pyc
 %%PYPY_LIBDIR%%/lib2to3/tests/data/fixers/bad_order.py
 %%PYPY_LIBDIR%%/lib2to3/tests/data/fixers/bad_order.pyc
 %%PYPY_LIBDIR%%/lib2to3/tests/data/fixers/myfixes/__init__.py
@@ -1454,9 +1492,9 @@
 %%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc
 %%PYPY_LIBDIR%%/lib_pypy/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3e8f69b6x1fd01a91.pypy-%%PYPY_VER%%.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g45f34413x310af836.pypy-%%PYPY_VER%%.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__ga01735dbxad93c709.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb0420b02x359e5476.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb1f15f1ex576c1bb2.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gf5132b8x39a3fadd.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py
 %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py
@@ -1504,6 +1542,8 @@
 %%PYPY_LIBDIR%%/lib_pypy/_curses_panel.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_elementtree.py
 %%PYPY_LIBDIR%%/lib_pypy/_elementtree.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_ffi.py
+%%PYPY_LIBDIR%%/lib_pypy/_ffi.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_functools.py
 %%PYPY_LIBDIR%%/lib_pypy/_functools.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_marshal.py
@@ -1538,10 +1578,13 @@
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/__init__.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/app.py
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/app.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_tkinter/license.terms
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.py
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.py
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.pyc
+%%PYPY_LIBDIR%%/lib_pypy/audioop.py
+%%PYPY_LIBDIR%%/lib_pypy/audioop.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cPickle.py
 %%PYPY_LIBDIR%%/lib_pypy/cPickle.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cStringIO.py
@@ -1549,6 +1592,7 @@
 %%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info
 %%PYPY_LIBDIR%%/lib_pypy/cffi/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/__init__.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/README
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/__init__.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/_ast_gen.py
@@ -1628,10 +1672,10 @@
 %%PYPY_LIBDIR%%/lib_pypy/datetime.pyc
 %%PYPY_LIBDIR%%/lib_pypy/dbm.py
 %%PYPY_LIBDIR%%/lib_pypy/dbm.pyc
-%%PYPY_LIBDIR%%/lib_pypy/disassembler.py
-%%PYPY_LIBDIR%%/lib_pypy/disassembler.pyc
 %%PYPY_LIBDIR%%/lib_pypy/future_builtins.py
 %%PYPY_LIBDIR%%/lib_pypy/future_builtins.pyc
+%%PYPY_LIBDIR%%/lib_pypy/gdbm.py
+%%PYPY_LIBDIR%%/lib_pypy/gdbm.pyc
 %%PYPY_LIBDIR%%/lib_pypy/greenlet.egg-info
 %%PYPY_LIBDIR%%/lib_pypy/greenlet.py
 %%PYPY_LIBDIR%%/lib_pypy/greenlet.pyc
@@ -2424,7 +2468,22 @@
 %%PYPY_LIBDIR%%/test/Sine-1000Hz-300ms.aif
 %%PYPY_LIBDIR%%/test/__init__.py
 %%PYPY_LIBDIR%%/test/__init__.pyc
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.aiff
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.au
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.wav
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm24.aiff
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm24.wav
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm32.aiff
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm32.au
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm32.wav
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm8.aiff
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm8.au
+%%PYPY_LIBDIR%%/test/audiodata/pluck-pcm8.wav
+%%PYPY_LIBDIR%%/test/audiodata/pluck-ulaw.aifc
+%%PYPY_LIBDIR%%/test/audiodata/pluck-ulaw.au
 %%PYPY_LIBDIR%%/test/audiotest.au
+%%PYPY_LIBDIR%%/test/audiotests.py
+%%PYPY_LIBDIR%%/test/audiotests.pyc
 %%PYPY_LIBDIR%%/test/autotest.py
 %%PYPY_LIBDIR%%/test/autotest.pyc
 %%PYPY_LIBDIR%%/test/bad_coding.py
@@ -2481,8 +2540,12 @@
 %%PYPY_LIBDIR%%/test/crashers/borrowed_ref_1.pyc
 %%PYPY_LIBDIR%%/test/crashers/borrowed_ref_2.py
 %%PYPY_LIBDIR%%/test/crashers/borrowed_ref_2.pyc
+%%PYPY_LIBDIR%%/test/crashers/buffer_mutate.py
+%%PYPY_LIBDIR%%/test/crashers/buffer_mutate.pyc
 %%PYPY_LIBDIR%%/test/crashers/compiler_recursion.py
 %%PYPY_LIBDIR%%/test/crashers/compiler_recursion.pyc
+%%PYPY_LIBDIR%%/test/crashers/decref_before_assignment.py
+%%PYPY_LIBDIR%%/test/crashers/decref_before_assignment.pyc
 %%PYPY_LIBDIR%%/test/crashers/gc_has_finalizer.py
 %%PYPY_LIBDIR%%/test/crashers/gc_has_finalizer.pyc
 %%PYPY_LIBDIR%%/test/crashers/gc_inspection.py
@@ -2685,7 +2748,10 @@
 %%PYPY_LIBDIR%%/test/mapping_tests.py
 %%PYPY_LIBDIR%%/test/mapping_tests.pyc
 %%PYPY_LIBDIR%%/test/math_testcases.txt
+%%PYPY_LIBDIR%%/test/mp_fork_bomb.py
+%%PYPY_LIBDIR%%/test/mp_fork_bomb.pyc
 %%PYPY_LIBDIR%%/test/nokia.pem
+%%PYPY_LIBDIR%%/test/nullbytecert.pem
 %%PYPY_LIBDIR%%/test/nullcert.pem
 %%PYPY_LIBDIR%%/test/outstanding_bugs.py
 %%PYPY_LIBDIR%%/test/outstanding_bugs.pyc
@@ -2714,6 +2780,10 @@
 %%PYPY_LIBDIR%%/test/reperf.pyc
 %%PYPY_LIBDIR%%/test/sample_doctest.py
 %%PYPY_LIBDIR%%/test/sample_doctest.pyc
+%%PYPY_LIBDIR%%/test/sample_doctest_no_docstrings.py
+%%PYPY_LIBDIR%%/test/sample_doctest_no_docstrings.pyc
+%%PYPY_LIBDIR%%/test/sample_doctest_no_doctests.py
+%%PYPY_LIBDIR%%/test/sample_doctest_no_doctests.pyc
 %%PYPY_LIBDIR%%/test/script_helper.py
 %%PYPY_LIBDIR%%/test/script_helper.pyc
 %%PYPY_LIBDIR%%/test/seq_tests.py
@@ -2722,12 +2792,12 @@
 %%PYPY_LIBDIR%%/test/sha256.pem
 %%PYPY_LIBDIR%%/test/sortperf.py
 %%PYPY_LIBDIR%%/test/sortperf.pyc
-%%PYPY_LIBDIR%%/test/ssl_cert.pem
-%%PYPY_LIBDIR%%/test/ssl_key.pem
 %%PYPY_LIBDIR%%/test/string_tests.py
 %%PYPY_LIBDIR%%/test/string_tests.pyc
 %%PYPY_LIBDIR%%/test/subprocessdata/sigchild_ignore.py
 %%PYPY_LIBDIR%%/test/subprocessdata/sigchild_ignore.pyc
+%%PYPY_LIBDIR%%/test/symlink_support.py
+%%PYPY_LIBDIR%%/test/symlink_support.pyc
 %%PYPY_LIBDIR%%/test/test_MimeWriter.py
 %%PYPY_LIBDIR%%/test/test_MimeWriter.pyc
 %%PYPY_LIBDIR%%/test/test_SimpleHTTPServer.py
@@ -2740,6 +2810,8 @@
 %%PYPY_LIBDIR%%/test/test___future__.pyc
 %%PYPY_LIBDIR%%/test/test__locale.py
 %%PYPY_LIBDIR%%/test/test__locale.pyc
+%%PYPY_LIBDIR%%/test/test__osx_support.py
+%%PYPY_LIBDIR%%/test/test__osx_support.pyc
 %%PYPY_LIBDIR%%/test/test_abc.py
 %%PYPY_LIBDIR%%/test/test_abc.pyc
 %%PYPY_LIBDIR%%/test/test_abstract_numbers.py
@@ -2983,6 +3055,8 @@
 %%PYPY_LIBDIR%%/test/test_file.pyc
 %%PYPY_LIBDIR%%/test/test_file2k.py
 %%PYPY_LIBDIR%%/test/test_file2k.pyc
+%%PYPY_LIBDIR%%/test/test_file_eintr.py
+%%PYPY_LIBDIR%%/test/test_file_eintr.pyc
 %%PYPY_LIBDIR%%/test/test_filecmp.py
 %%PYPY_LIBDIR%%/test/test_filecmp.pyc
 %%PYPY_LIBDIR%%/test/test_fileinput.py
@@ -3073,6 +3147,8 @@
 %%PYPY_LIBDIR%%/test/test_httplib.pyc
 %%PYPY_LIBDIR%%/test/test_httpservers.py
 %%PYPY_LIBDIR%%/test/test_httpservers.pyc
+%%PYPY_LIBDIR%%/test/test_idle.py
+%%PYPY_LIBDIR%%/test/test_idle.pyc
 %%PYPY_LIBDIR%%/test/test_imageop.py
 %%PYPY_LIBDIR%%/test/test_imageop.pyc
 %%PYPY_LIBDIR%%/test/test_imaplib.py
@@ -3137,6 +3213,8 @@
 %%PYPY_LIBDIR%%/test/test_macostools.pyc
 %%PYPY_LIBDIR%%/test/test_macpath.py
 %%PYPY_LIBDIR%%/test/test_macpath.pyc
+%%PYPY_LIBDIR%%/test/test_macurl2path.py
+%%PYPY_LIBDIR%%/test/test_macurl2path.pyc
 %%PYPY_LIBDIR%%/test/test_mailbox.py
 %%PYPY_LIBDIR%%/test/test_mailbox.pyc
 %%PYPY_LIBDIR%%/test/test_marshal.py
@@ -3183,6 +3261,8 @@
 %%PYPY_LIBDIR%%/test/test_new.pyc
 %%PYPY_LIBDIR%%/test/test_nis.py
 %%PYPY_LIBDIR%%/test/test_nis.pyc
+%%PYPY_LIBDIR%%/test/test_nntplib.py
+%%PYPY_LIBDIR%%/test/test_nntplib.pyc
 %%PYPY_LIBDIR%%/test/test_normalization.py
 %%PYPY_LIBDIR%%/test/test_normalization.pyc
 %%PYPY_LIBDIR%%/test/test_ntpath.py
@@ -3343,6 +3423,8 @@
 %%PYPY_LIBDIR%%/test/test_ssl.pyc
 %%PYPY_LIBDIR%%/test/test_startfile.py
 %%PYPY_LIBDIR%%/test/test_startfile.pyc
+%%PYPY_LIBDIR%%/test/test_stat.py
+%%PYPY_LIBDIR%%/test/test_stat.pyc
 %%PYPY_LIBDIR%%/test/test_str.py
 %%PYPY_LIBDIR%%/test/test_str.pyc
 %%PYPY_LIBDIR%%/test/test_strftime.py
@@ -3365,6 +3447,8 @@
 %%PYPY_LIBDIR%%/test/test_structseq.pyc
 %%PYPY_LIBDIR%%/test/test_subprocess.py
 %%PYPY_LIBDIR%%/test/test_subprocess.pyc
+%%PYPY_LIBDIR%%/test/test_sunau.py
+%%PYPY_LIBDIR%%/test/test_sunau.pyc
 %%PYPY_LIBDIR%%/test/test_sunaudiodev.py
 %%PYPY_LIBDIR%%/test/test_sunaudiodev.pyc
 %%PYPY_LIBDIR%%/test/test_sundry.py
@@ -3413,6 +3497,8 @@
 %%PYPY_LIBDIR%%/test/test_tk.pyc
 %%PYPY_LIBDIR%%/test/test_tokenize.py
 %%PYPY_LIBDIR%%/test/test_tokenize.pyc
+%%PYPY_LIBDIR%%/test/test_tools.py
+%%PYPY_LIBDIR%%/test/test_tools.pyc
 %%PYPY_LIBDIR%%/test/test_trace.py
 %%PYPY_LIBDIR%%/test/test_trace.pyc
 %%PYPY_LIBDIR%%/test/test_traceback.py