diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 341379528..0b865023c 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -25,6 +25,7 @@ Documentation::
 Build::
 
   * core: fix build with CMake and Ninja
+  * debian: add package weechat-headless with the headless binary and its man page
 
 [[v2.1]]
 == Version 2.1 (2018-03-18)
diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc
index bc86b9425..5d29b2d14 100644
--- a/ReleaseNotes.adoc
+++ b/ReleaseNotes.adoc
@@ -17,6 +17,17 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 (file _ChangeLog.adoc_ in sources).
 
 
+[[v2.2]]
+== Version 2.2 (under dev)
+
+[[v2.2_debian_headless_package]]
+=== New Debian package for headless version
+
+A new Debian package has been added: _weechat-headless_ which contains the
+binary _weechat-headless_ and its man page.
+
+In version 2.0, this binary was in the package _weechat-curses_.
+
 [[v2.1]]
 == Version 2.1 (2018-03-18)
 
@@ -98,7 +109,7 @@ For more information about this feature, you can read help with:
 
 The Debian packaging has changed (for now only on weechat.org repositories,
 not in Debian official repositories). +
-The package `weechat-plugins` has been split into 9 packages:
+The package _weechat-plugins_ has been split into 9 packages:
 
 - weechat-plugins (with only the following plugins: aspell, exec, fifo, relay,
   script, trigger)
diff --git a/debian-devel/control b/debian-devel/control
index b23d8cfc1..46b2f9a7e 100644
--- a/debian-devel/control
+++ b/debian-devel/control
@@ -28,7 +28,8 @@ Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
 
 Package: weechat-devel
 Architecture: all
-Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version})
+Depends: ${misc:Depends}, weechat-devel-curses (>= ${source:Version}) |
+ weechat-devel-headless (>= ${source:Version})
 Suggests: weechat-devel-doc (= ${source:Version})
 Conflicts: weechat
 Description: Fast, light and extensible chat client (metapackage)
@@ -79,6 +80,34 @@ Description: Fast, light and extensible chat client - console client
  .
  This package provides the console client (ncurses).
 
+Package: weechat-devel-headless
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-core (= ${binary:Version})
+Conflicts: weechat-headless
+Recommends: weechat-devel-plugins (= ${binary:Version})
+Suggests: weechat-devel-doc (= ${source:Version})
+Description: Fast, light and extensible chat client - console client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-devel-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -90,11 +119,12 @@ Description: Fast, light and extensible chat client - core files
  .
  This package provides core plugins and locales files for WeeChat. It
  currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.
 
 Package: weechat-devel-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-plugins
 Description: Fast, light and extensible chat client - plugins
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -110,7 +140,8 @@ Description: Fast, light and extensible chat client - plugins
 
 Package: weechat-devel-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-python
 Description: Fast, light and extensible chat client - python plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -120,7 +151,8 @@ Description: Fast, light and extensible chat client - python plugin
 
 Package: weechat-devel-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-perl
 Description: Fast, light and extensible chat client - perl plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -130,7 +162,8 @@ Description: Fast, light and extensible chat client - perl plugin
 
 Package: weechat-devel-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-ruby
 Description: Fast, light and extensible chat client - ruby plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -140,7 +173,8 @@ Description: Fast, light and extensible chat client - ruby plugin
 
 Package: weechat-devel-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-lua
 Description: Fast, light and extensible chat client - lua plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -150,7 +184,8 @@ Description: Fast, light and extensible chat client - lua plugin
 
 Package: weechat-devel-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-tcl
 Description: Fast, light and extensible chat client - tcl plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -160,7 +195,8 @@ Description: Fast, light and extensible chat client - tcl plugin
 
 Package: weechat-devel-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-guile
 Description: Fast, light and extensible chat client - guile plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -170,7 +206,8 @@ Description: Fast, light and extensible chat client - guile plugin
 
 Package: weechat-devel-javascript
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version})
 Conflicts: weechat-javascript
 Description: Fast, light and extensible chat client - javascript plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -180,8 +217,8 @@ Description: Fast, light and extensible chat client - javascript plugin
 
 Package: weechat-devel-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}),
- libphp7.2-embed
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-devel-curses (= ${binary:Version}) |
+ weechat-devel-headless (= ${binary:Version}), libphp7.2-embed
 Conflicts: weechat-php
 Description: Fast, light and extensible chat client - php plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -216,7 +253,8 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, weechat-devel-curses (= ${binary:Version}) |
- weechat-devel-core (= ${binary:Version}), weechat-devel-plugins (= ${binary:Version})
+ weechat-devel-headless (= ${binary:Version}) | weechat-devel-core (= ${binary:Version}),
+ weechat-devel-plugins (= ${binary:Version})
 Conflicts: weechat-dbg
 Description: Fast, light and extensible chat client - debugging symbols
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
diff --git a/debian-devel/weechat-devel-headless.dirs b/debian-devel/weechat-devel-headless.dirs
new file mode 120000
index 000000000..f788a67e5
--- /dev/null
+++ b/debian-devel/weechat-devel-headless.dirs
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.dirs
\ No newline at end of file
diff --git a/debian-devel/weechat-devel-headless.install b/debian-devel/weechat-devel-headless.install
new file mode 120000
index 000000000..b6e8df51e
--- /dev/null
+++ b/debian-devel/weechat-devel-headless.install
@@ -0,0 +1 @@
+../debian-stable/weechat-headless.install
\ No newline at end of file
diff --git a/debian-stable/control b/debian-stable/control
index 0dfb397e8..4ed65f37e 100644
--- a/debian-stable/control
+++ b/debian-stable/control
@@ -28,7 +28,8 @@ Vcs-Browser: https://anonscm.debian.org/git/users/kolter/weechat.git
 
 Package: weechat
 Architecture: all
-Depends: ${misc:Depends}, weechat-curses (>= ${source:Version})
+Depends: ${misc:Depends}, weechat-curses (>= ${source:Version}) |
+ weechat-headless (>= ${source:Version})
 Suggests: weechat-doc (= ${source:Version})
 Description: Fast, light and extensible chat client (metapackage)
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -79,6 +80,35 @@ Description: Fast, light and extensible chat client - console client
  .
  This package provides the console client (ncurses).
 
+Package: weechat-headless
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-core (= ${binary:Version})
+Conflicts: weechat-common
+Breaks: weechat-scripts (<= 20090221-1)
+Recommends: weechat-plugins (= ${binary:Version})
+Suggests: weechat-doc (= ${source:Version})
+Description: Fast, light and extensible chat client - console client
+ WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
+ for many operating systems. Everything can be done with a keyboard.
+ It is customizable and extensible with plugins/scripts, and includes:
+  - support of IRC protocol (native)
+  - support of XMPP/Jabber protocol (with additional script)
+  - nicklist
+  - smart hotlist
+  - horizontal and vertical split
+  - double charset support (decode/encode)
+  - FIFO pipe for remote control
+  - 256 colors support
+  - incremental text search
+  - dynamic filtering of buffer content
+  - Perl, Python, Ruby, Lua, Tcl, Scheme, JavaScript and PHP scripting
+  - script manager
+  - spell checking
+  - highly customizable and extensible
+  - and much more!
+ .
+ This package provides the headless client.
+
 Package: weechat-core
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -90,11 +120,12 @@ Description: Fast, light and extensible chat client - core files
  .
  This package provides core plugins and locales files for WeeChat. It
  currently ships the following plugins: alias, buflist, charset, fset, irc,
- logger and xfer. It is useless without weechat-curses.
+ logger and xfer. It is useless without weechat-curses or weechat-headless.
 
 Package: weechat-plugins
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Suggests: weechat-scripts (>> 20090221-1)
 Description: Fast, light and extensible chat client - plugins
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
@@ -110,7 +141,8 @@ Description: Fast, light and extensible chat client - plugins
 
 Package: weechat-python
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - python plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -119,7 +151,8 @@ Description: Fast, light and extensible chat client - python plugin
 
 Package: weechat-perl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - perl plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -128,7 +161,8 @@ Description: Fast, light and extensible chat client - perl plugin
 
 Package: weechat-ruby
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - ruby plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -137,7 +171,8 @@ Description: Fast, light and extensible chat client - ruby plugin
 
 Package: weechat-lua
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - lua plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -146,7 +181,8 @@ Description: Fast, light and extensible chat client - lua plugin
 
 Package: weechat-tcl
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - tcl plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -155,7 +191,8 @@ Description: Fast, light and extensible chat client - tcl plugin
 
 Package: weechat-guile
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - guile plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -164,7 +201,8 @@ Description: Fast, light and extensible chat client - guile plugin
 
 Package: weechat-javascript
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version})
 Description: Fast, light and extensible chat client - javascript plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -173,8 +211,8 @@ Description: Fast, light and extensible chat client - javascript plugin
 
 Package: weechat-php
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}),
- libphp7.2-embed
+Depends: ${misc:Depends}, ${shlibs:Depends}, weechat-curses (= ${binary:Version}) |
+ weechat-headless (= ${binary:Version}), libphp7.2-embed
 Description: Fast, light and extensible chat client - php plugin
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
@@ -206,7 +244,8 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: ${misc:Depends}, weechat-curses (= ${binary:Version}) |
- weechat-core (= ${binary:Version}), weechat-plugins (= ${binary:Version})
+ weechat-headless (= ${binary:Version}) | weechat-core (= ${binary:Version}),
+ weechat-plugins (= ${binary:Version})
 Description: Fast, light and extensible chat client - debugging symbols
  WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
  for many operating systems. Everything can be done with a keyboard.
diff --git a/debian-stable/weechat-curses.install b/debian-stable/weechat-curses.install
index 13ee787f4..9ca632180 100644
--- a/debian-stable/weechat-curses.install
+++ b/debian-stable/weechat-curses.install
@@ -1,7 +1,4 @@
 usr/bin/weechat
-usr/bin/weechat-headless
 debian/weechat.xpm usr/share/pixmaps
 usr/share/man/man1/weechat.1
 usr/share/man/*/man1/weechat.1
-usr/share/man/man1/weechat-headless.1
-usr/share/man/*/man1/weechat-headless.1
diff --git a/debian-stable/weechat-headless.dirs b/debian-stable/weechat-headless.dirs
new file mode 100644
index 000000000..e77248175
--- /dev/null
+++ b/debian-stable/weechat-headless.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian-stable/weechat-headless.install b/debian-stable/weechat-headless.install
new file mode 100644
index 000000000..0f6cdcf54
--- /dev/null
+++ b/debian-stable/weechat-headless.install
@@ -0,0 +1,3 @@
+usr/bin/weechat-headless
+usr/share/man/man1/weechat-headless.1
+usr/share/man/*/man1/weechat-headless.1