diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 9f3c276c7683..f672c1114ee7 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bpython
-PORTVERSION=	0.9.6.2
+PORTVERSION=	0.9.7.1
 CATEGORIES=	devel python
 MASTER_SITES=	http://bpython-interpreter.org/releases/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
diff --git a/devel/bpython/distinfo b/devel/bpython/distinfo
index fd8256f31db9..64fae8ade2e8 100644
--- a/devel/bpython/distinfo
+++ b/devel/bpython/distinfo
@@ -1,3 +1,3 @@
-MD5 (bpython-0.9.6.2.tar.gz) = d30fdb663fa9957c21c63108ed249b59
-SHA256 (bpython-0.9.6.2.tar.gz) = 0a9569c8c8513ee9e91fdad436fe0785cbb8b456f972f6000db193102e818eee
-SIZE (bpython-0.9.6.2.tar.gz) = 64483
+MD5 (bpython-0.9.7.1.tar.gz) = f32ce6aa8ae6af8d2cf65e13f58859d4
+SHA256 (bpython-0.9.7.1.tar.gz) = e440b20035f3261ed6cf3d842c4db56b9ff8e2eb7d33e375aeed3b4cc8668b6d
+SIZE (bpython-0.9.7.1.tar.gz) = 83229
diff --git a/devel/bpython/files/patch-setup.py b/devel/bpython/files/patch-setup.py
index 59840f704558..7a35a7e3049c 100644
--- a/devel/bpython/files/patch-setup.py
+++ b/devel/bpython/files/patch-setup.py
@@ -10,7 +10,7 @@ $FreeBSD$
 -    install_requires = [
 -        'pygments'
 -    ],
-     packages = ["bpython"],
+     packages = ["bpython", "bpdb"],
      data_files = [
 -        (os.path.join(man_dir, 'man1'), ['doc/bpython.1']),
 -        (os.path.join(man_dir, 'man5'), ['doc/bpython-config.5']),
diff --git a/devel/bpython/pkg-plist b/devel/bpython/pkg-plist
index c61c9ba6fc5e..8997bdbe730e 100644
--- a/devel/bpython/pkg-plist
+++ b/devel/bpython/pkg-plist
@@ -7,6 +7,12 @@ bin/bpython-gtk
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb/debugger.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/__init__.pyo
@@ -44,9 +50,13 @@ bin/bpython-gtk
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/repl.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython/urwid.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/applications/bpython.desktop
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/share
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpython
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/bpdb
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%