diff --git a/editors/Makefile b/editors/Makefile
index 126dec77853a..376d3b72e7b5 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -227,6 +227,7 @@
     SUBDIR += poedit
     SUBDIR += psgml
     SUBDIR += puff
+    SUBDIR += py-editorconfig
     SUBDIR += py-room
     SUBDIR += rox-edit
     SUBDIR += scite
diff --git a/editors/py-editorconfig/Makefile b/editors/py-editorconfig/Makefile
new file mode 100644
index 000000000000..816572ba6bde
--- /dev/null
+++ b/editors/py-editorconfig/Makefile
@@ -0,0 +1,20 @@
+# Created by: Shaun Amott <shaun@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	editorconfig
+PORTVERSION=	0.12.1
+CATEGORIES=	editors python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	EditorConfig-${DISTVERSION}
+
+MAINTAINER=	shaun@FreeBSD.org
+COMMENT=	EditorConfig File Locator and Interpreter for Python
+
+LICENSE=	PSFL
+
+USES?=		python
+USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/editors/py-editorconfig/distinfo b/editors/py-editorconfig/distinfo
new file mode 100644
index 000000000000..b4e34a3253dc
--- /dev/null
+++ b/editors/py-editorconfig/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1491961164
+SHA256 (EditorConfig-0.12.1.tar.gz) = 8b53c857956194a21043753c9adca5a5b0eaef6cf1db3273a362ddec78f2b8e3
+SIZE (EditorConfig-0.12.1.tar.gz) = 19282
diff --git a/editors/py-editorconfig/pkg-descr b/editors/py-editorconfig/pkg-descr
new file mode 100644
index 000000000000..84195dd5423b
--- /dev/null
+++ b/editors/py-editorconfig/pkg-descr
@@ -0,0 +1,7 @@
+EditorConfig makes it easy to maintain the correct coding style when
+switching between different text editors and between different projects.
+The EditorConfig project maintains a file format and plugins for various
+text editors which allow this file format to be read and used by those
+editors.
+
+WWW: http://editorconfig.org/