diff --git a/net/Makefile b/net/Makefile
index 0a8fa9d8ff1d..363fd1f4c888 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -945,6 +945,7 @@
     SUBDIR += py-tweepy
     SUBDIR += py-twistedPair
     SUBDIR += py-twitter
+    SUBDIR += py-twitter-tools
     SUBDIR += py-txamqp
     SUBDIR += py-urllib3
     SUBDIR += py-xmlrpc
diff --git a/net/py-twitter-tools/Makefile b/net/py-twitter-tools/Makefile
new file mode 100644
index 000000000000..ad2b236a1fb1
--- /dev/null
+++ b/net/py-twitter-tools/Makefile
@@ -0,0 +1,24 @@
+# Created by: Kubilay Kocak <koobs@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	twitter-tools
+PORTVERSION=	1.9.4
+CATEGORIES=	net python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	twitter-${PORTVERSION}
+
+MAINTAINER=	koobs@FreeBSD.org
+COMMENT=	Python API and command-line toolset for Twitter
+
+USE_GITHUB=		yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	easy_install
+
+GH_ACCOUNT=	sixohsix
+GH_PROJECT=	twitter
+GH_TAGNAME=	${DISTNAME}
+GH_COMMIT=	479117d
+
+PYDISTUTILS_PKGNAME=	twitter
+
+.include <bsd.port.mk>
diff --git a/net/py-twitter-tools/distinfo b/net/py-twitter-tools/distinfo
new file mode 100644
index 000000000000..8d133e361803
--- /dev/null
+++ b/net/py-twitter-tools/distinfo
@@ -0,0 +1,2 @@
+SHA256 (twitter-1.9.4.tar.gz) = 2ae156565cfd0d870b769db5399d48e7aa097e39cd943a912f9bf12dab6e8dd1
+SIZE (twitter-1.9.4.tar.gz) = 34506
diff --git a/net/py-twitter-tools/files/patch-setup.py b/net/py-twitter-tools/files/patch-setup.py
new file mode 100644
index 000000000000..7417fc66a02c
--- /dev/null
+++ b/net/py-twitter-tools/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- ./setup.py.orig	2013-05-25 10:38:02.218078478 +1000
++++ ./setup.py	2013-05-25 10:38:10.792279089 +1000
+@@ -33,7 +33,7 @@
+       license='MIT License',
+       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+       include_package_data=True,
+-      zip_safe=True,
++      zip_safe=False,
+       install_requires=install_requires,
+       entry_points="""
+       # -*- Entry points: -*-
diff --git a/net/py-twitter-tools/pkg-descr b/net/py-twitter-tools/pkg-descr
new file mode 100644
index 000000000000..6f27e3f46041
--- /dev/null
+++ b/net/py-twitter-tools/pkg-descr
@@ -0,0 +1,8 @@
+The Minimalist Twitter API for Python is a Python API for Twitter, everyone's
+favorite Web 2.0 Facebook-style status updater for people on the go.
+
+Also included is a twitter command-line tool for getting your friends' tweets
+and setting your own tweet from the safety and security of your favorite shell
+and an IRC bot that can announce Twitter updates to an IRC channel.
+
+WWW: https://github.com/sixohsix/twitter
diff --git a/net/py-twitter-tools/pkg-plist b/net/py-twitter-tools/pkg-plist
new file mode 100644
index 000000000000..9275ee1d5497
--- /dev/null
+++ b/net/py-twitter-tools/pkg-plist
@@ -0,0 +1,60 @@
+bin/twitter-log
+bin/twitter
+bin/twitterbot
+bin/twitter-follow
+bin/twitter-stream-example
+bin/twitter-archiver
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%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%%/twitter/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ansi.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ansi.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ansi.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/api.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/api.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/api.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/archiver.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/archiver.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/archiver.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/auth.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/auth.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/auth.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/cmdline.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/cmdline.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/cmdline.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/follow.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/follow.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/follow.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ircbot.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ircbot.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/ircbot.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/logger.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/logger.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/logger.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth_dance.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth_dance.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/oauth_dance.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream_example.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream_example.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/stream_example.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/twitter_globals.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/twitter_globals.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/twitter_globals.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter/util.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/twitter
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%