diff --git a/misc/Makefile b/misc/Makefile
index ace87222433a..92658e50ae0f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -465,6 +465,7 @@
     SUBDIR += tempcontrol
     SUBDIR += termatrix
     SUBDIR += teseq
+    SUBDIR += thefuck
     SUBDIR += timediff
     SUBDIR += tkcron
     SUBDIR += tkinfo
diff --git a/misc/thefuck/Makefile b/misc/thefuck/Makefile
new file mode 100644
index 000000000000..09a81828f99f
--- /dev/null
+++ b/misc/thefuck/Makefile
@@ -0,0 +1,25 @@
+# Created by: Guangyuan Yang <ygy@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	thefuck
+DISTVERSION=	3.25
+CATEGORIES=	misc python
+MASTER_SITES=	CHEESESHOP
+
+MAINTAINER=	ygy@FreeBSD.org
+COMMENT=	App that corrects your previous console command
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colorama>0:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyte>0:devel/py-pyte@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+
+USES=		python:3.4+
+USE_PYTHON=	autoplist distutils noflavors
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/misc/thefuck/distinfo b/misc/thefuck/distinfo
new file mode 100644
index 000000000000..ba0377499a16
--- /dev/null
+++ b/misc/thefuck/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1512711410
+SHA256 (thefuck-3.25.tar.gz) = 70cbe6295d2d2d371a395619216d38eb1666e4b3c3b1a24f67d11b88e65fea78
+SIZE (thefuck-3.25.tar.gz) = 63444
diff --git a/misc/thefuck/pkg-descr b/misc/thefuck/pkg-descr
new file mode 100644
index 000000000000..a1af4b98b879
--- /dev/null
+++ b/misc/thefuck/pkg-descr
@@ -0,0 +1,10 @@
+Thefuck is a magnificent app which corrects your previous console command.
+It tries to match a rule for the previous command, creates a new command
+using the matched rule and runs it. Thefuck comes with a lot of predefined
+rules, but you can create your own rules as well.
+
+You should place this command in your shell config file:
+
+eval $(thefuck --alias)
+
+WWW: https://github.com/nvbn/thefuck