diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index 0ca5d0ec9856..9276fc1d5cb3 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1
 CATEGORIES=	irc
 MASTER_SITES=	https://weechat.org/files/src/
 
@@ -22,8 +22,10 @@ USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DENABLE_GUILE=no \
 		-DLIBDATADIR=${LOCALBASE}/libdata
 
-OPTIONS_DEFINE=		BACKTRACE DOCS CA_BUNDLE GNUTLS ICON ICONV MANPAGES NLS
-OPTIONS_DEFAULT=	ASPELL BACKTRACE CA_BUNDLE CHARSET GNUTLS ICON LUA MANPAGES PERL PYTHON RUBY TCL
+OPTIONS_DEFINE=		BACKTRACE DOCS CA_BUNDLE GNUTLS HEADLESS ICON ICONV \
+			MANPAGES NLS
+OPTIONS_DEFAULT=	ASPELL BACKTRACE CA_BUNDLE CHARSET GNUTLS HEADLESS \
+			ICON LUA MANPAGES PERL PYTHON RUBY TCL
 OPTIONS_SUB=		yes
 
 # BROKEN: ruby.h: error: wrong number of arguments specified for 'deprecated' attribute
@@ -34,11 +36,11 @@ OPTIONS_GROUP_PLUGINS=	ASPELL CHARSET JAVASCRIPT LUA PERL PYTHON PHP RUBY TCL
 
 BACKTRACE_DESC=		Provide crash backtraces
 CA_BUNDLE_DESC=		Include CA bundle for certificate verification
-ICON_DESC=		Desktop icon
-
-PLUGINS_DESC=		Weechat Plugins
 CHARSET_DESC=		Charset plugin (implies ICONV)
+ICON_DESC=		Desktop icon
+HEADLESS_DESC=		Build headless weechat as well
 JAVASCRIPT_DESC=	Javascript script support
+PLUGINS_DESC=		Weechat Plugins
 PYTHON_DESC=		Python script support
 RUBY_DESC=		Ruby script support
 
@@ -53,6 +55,7 @@ CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root
 CHARSET_IMPLIES=	ICONV
 DOCS_CMAKE_BOOL=	ENABLE_DOC
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/asciidoctor:textproc/rubygem-asciidoctor
+HEADLESS_CMAKE_BOOL=	ENABLE_HEADLESS
 ICONV_USES=		iconv
 JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 5bf32096ebaa..ca7c592e7b35 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513856490
-SHA256 (weechat-2.0.1.tar.xz) = 6943582eabbd8a6fb6dca860a86f896492cae5fceacaa396dbc9eeaa722305d1
-SIZE (weechat-2.0.1.tar.xz) = 1967336
+TIMESTAMP = 1521402135
+SHA256 (weechat-2.1.tar.xz) = cda0f81ff8243fd25cca76c8e490e2fdb5b8fbb2554d7aa87cb3b0beda16ed38
+SIZE (weechat-2.1.tar.xz) = 1990748
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index 01101f540689..a393e1d2606b 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -1,5 +1,6 @@
 bin/weechat
 bin/weechat-curses
+%%HEADLESS%%bin/weechat-headless
 include/weechat/weechat-plugin.h
 lib/weechat/plugins/alias.so
 lib/weechat/plugins/buflist.so
@@ -14,13 +15,21 @@ lib/weechat/plugins/trigger.so
 lib/weechat/plugins/xfer.so
 libdata/pkgconfig/weechat.pc
 %%MANPAGES%%man/man1/weechat.1.gz
+%%MANPAGES%%man/man1/weechat-headless.1.gz
 %%MANPAGES%%man/cs/man1/weechat.1.gz
+%%MANPAGES%%man/cs/man1/weechat-headless.1.gz
 %%MANPAGES%%man/de/man1/weechat.1.gz
+%%MANPAGES%%man/de/man1/weechat-headless.1.gz
 %%MANPAGES%%man/fr/man1/weechat.1.gz
+%%MANPAGES%%man/fr/man1/weechat-headless.1.gz
 %%MANPAGES%%man/it/man1/weechat.1.gz
+%%MANPAGES%%man/it/man1/weechat-headless.1.gz
 %%MANPAGES%%man/ja/man1/weechat.1.gz
+%%MANPAGES%%man/ja/man1/weechat-headless.1.gz
 %%MANPAGES%%man/pl/man1/weechat.1.gz
+%%MANPAGES%%man/pl/man1/weechat-headless.1.gz
 %%MANPAGES%%man/ru/man1/weechat.1.gz
+%%MANPAGES%%man/ru/man1/weechat-headless.1.gz
 %%ASPELL%%lib/weechat/plugins/aspell.so
 %%CHARSET%%lib/weechat/plugins/charset.so
 %%JAVASCRIPT%%lib/weechat/plugins/javascript.so