diff --git a/devel/Makefile b/devel/Makefile
index 7640c8eb0414..46714a928be1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -319,6 +319,7 @@
     SUBDIR += cobf
     SUBDIR += coccinelle
     SUBDIR += codeblocks
+    SUBDIR += codesearch-py
     SUBDIR += codeville
     SUBDIR += codeworker
     SUBDIR += colorgcc
diff --git a/devel/codesearch-py/Makefile b/devel/codesearch-py/Makefile
new file mode 100644
index 000000000000..6990136fdfe2
--- /dev/null
+++ b/devel/codesearch-py/Makefile
@@ -0,0 +1,27 @@
+# Created by: Carlos J. Puga Medina <cpm@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	codesearch-py
+PORTVERSION=	0.1
+CATEGORIES=	devel python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	cpm@FreeBSD.org
+COMMENT=	Python library for accessing Chromium CodeSearch
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	chromium
+GH_TAGNAME=	ec3ad68
+
+NO_ARCH=	yes
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m unittest discover -v
+
+.include <bsd.port.mk>
diff --git a/devel/codesearch-py/distinfo b/devel/codesearch-py/distinfo
new file mode 100644
index 000000000000..8341796289b5
--- /dev/null
+++ b/devel/codesearch-py/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498485588
+SHA256 (chromium-codesearch-py-0.1-ec3ad68_GH0.tar.gz) = 93c5c3476fafcec52d0bc1f732b31d9ddc700882e5f6755b36da7740f747ef24
+SIZE (chromium-codesearch-py-0.1-ec3ad68_GH0.tar.gz) = 335302
diff --git a/devel/codesearch-py/pkg-descr b/devel/codesearch-py/pkg-descr
new file mode 100644
index 000000000000..479fe4d68ae8
--- /dev/null
+++ b/devel/codesearch-py/pkg-descr
@@ -0,0 +1,11 @@
+The codesearch Python library provides an interface for talking to the
+Chromium CodeSearch backend.
+
+The primary entry point into the library is the codesearch class. Various
+message classes you are likely to encounter are defined in messages.py
+
+In addition, the library also includes facilities for maintaining an
+ephemeral or persistent cache in order to minimize generated network
+traffic.
+
+WWW: https://github.com/chromium/codesearch-py