diff --git a/www/py-requests-toolbelt/Makefile b/www/py-requests-toolbelt/Makefile
new file mode 100644
index 00000000000..f82618c460e
--- /dev/null
+++ b/www/py-requests-toolbelt/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2017/03/17 07:48:46 sthen Exp $
+
+COMMENT =		utility belt for advanced users of python-requests
+
+MODPY_EGG_VERSION =	0.7.1
+DISTNAME =		requests-toolbelt-${MODPY_EGG_VERSION}
+PKGNAME =		py-${DISTNAME}
+
+CATEGORIES =		www
+
+HOMEPAGE =		https://github.com/sigmavirus24/requests-toolbelt
+
+# APLv2
+PERMIT_PACKAGE_CDROM =	Yes
+
+MODULES =		lang/python
+
+RUN_DEPENDS =		www/py-requests${MODPY_FLAVOR}
+
+MODPY_PI =		Yes
+MODPY_SETUPTOOLS =	Yes
+
+FLAVORS =		python3
+FLAVOR ?=
+
+TEST_DEPENDS =		devel/py-test${MODPY_FLAVOR} \
+			devel/py-mock${MODPY_FLAVOR} \
+			www/py-betamax${MODPY_FLAVOR}
+
+do-test:
+	cd ${WRKSRC} && ${MODPY_BIN} -m pytest
+
+.include <bsd.port.mk>
diff --git a/www/py-requests-toolbelt/distinfo b/www/py-requests-toolbelt/distinfo
new file mode 100644
index 00000000000..d9b963c1289
--- /dev/null
+++ b/www/py-requests-toolbelt/distinfo
@@ -0,0 +1,2 @@
+SHA256 (requests-toolbelt-0.7.1.tar.gz) = w4Q4hCadeeSSUi8+n0kJF+B0wd27gBEZaJcOch/jbq8=
+SIZE (requests-toolbelt-0.7.1.tar.gz) = 194670
diff --git a/www/py-requests-toolbelt/patches/patch-requests_toolbelt_adapters_socket_options_py b/www/py-requests-toolbelt/patches/patch-requests_toolbelt_adapters_socket_options_py
new file mode 100644
index 00000000000..431392f6912
--- /dev/null
+++ b/www/py-requests-toolbelt/patches/patch-requests_toolbelt_adapters_socket_options_py
@@ -0,0 +1,25 @@
+$OpenBSD: patch-requests_toolbelt_adapters_socket_options_py,v 1.1.1.1 2017/03/17 07:48:46 sthen Exp $
+--- requests_toolbelt/adapters/socket_options.py.orig	Fri Mar 17 07:42:45 2017
++++ requests_toolbelt/adapters/socket_options.py	Fri Mar 17 07:43:47 2017
+@@ -104,14 +104,19 @@ class TCPKeepAliveAdapter(SocketOptionsAdapter):
+         count = kwargs.pop('count', 5)
+         socket_options = socket_options + [
+             (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+-            (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, interval),
+-            (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, count),
+         ]
+ 
+         # NOTE(Ian): Apparently OSX does not have this constant defined, so we
+         # set it conditionally.
+         if getattr(socket, 'TCP_KEEPIDLE', None) is not None:
+             socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, idle)]
++
++	# ...same for OpenBSD and these two:
++        if getattr(socket, 'TCP_KEEPINTVL', None) is not None:
++            socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, idle)]
++
++        if getattr(socket, 'TCP_KEEPCNT', None) is not None:
++            socket_options += [(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, idle)]
+ 
+         super(TCPKeepAliveAdapter, self).__init__(
+             socket_options=socket_options, **kwargs
diff --git a/www/py-requests-toolbelt/pkg/DESCR b/www/py-requests-toolbelt/pkg/DESCR
new file mode 100644
index 00000000000..ddd147bec37
--- /dev/null
+++ b/www/py-requests-toolbelt/pkg/DESCR
@@ -0,0 +1,2 @@
+A collection of utilities for python-requests that don't belong in
+requests proper.
diff --git a/www/py-requests-toolbelt/pkg/PLIST b/www/py-requests-toolbelt/pkg/PLIST
new file mode 100644
index 00000000000..a4b56da2f3f
--- /dev/null
+++ b/www/py-requests-toolbelt/pkg/PLIST
@@ -0,0 +1,89 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2017/03/17 07:48:46 sthen Exp $
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/${MODPY_PYCACHE}streaming_iterator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/_compat.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}appengine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}fingerprint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}host_header_ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}socket_options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/appengine.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/fingerprint.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/host_header_ssl.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/socket_options.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/source.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/adapters/ssl.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}_digest_auth_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}guess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}handler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/${MODPY_PYCACHE}http_proxy_digest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/_digest_auth_compat.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/guess.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/handler.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/auth/http_proxy_digest.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/${MODPY_PYCACHE}forgetful.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/cookies/forgetful.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/${MODPY_PYCACHE}stream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/${MODPY_PYCACHE}tee.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/stream.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/downloadutils/tee.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/decoder.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/multipart/encoder.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/sessions.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/streaming_iterator.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/${MODPY_PYCACHE}pool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/${MODPY_PYCACHE}thread.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/pool.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/threaded/thread.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}deprecated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}dump.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}formdata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/${MODPY_PYCACHE}user_agent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/deprecated.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/dump.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/formdata.py
+lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/utils/user_agent.py