diff --git a/CHANGELOG b/CHANGELOG
index 22088af..6811cd0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,32 @@
+2017-01-21 i3status 2.11
+
+ • re-add forgotten wakeup call from SIGUSR1 handler
+ • disk_info: bugfix: check format_not_mounted is not NULL before using it
+ • revert back to using nanosleep
+ • man: give more descriptive symbols to battery format
+ • battery: removes the 'remaining' time when the battery is full
+ • add separator and separator_block_width as universal module options
+ • man: fix link to contrib
+ • cpu_temperature: add glob check
+ • battery: add status_unk
+ • reconnect to PluseAudio when connection is lost
+ • wireless: add ifdef to compile on macOS
+ • order default configuration paths the same as in i3
+ • add version files for release tarball
+ • man: make tztime example config match the context
+ • cpu_usage: add color thresholds
+ • battery: support multiple batteries
+ • disk: use empty string for not mounted disks
+ • default config: remove DHCP, VPN
+ • wireless: fix FTBFS on hurd and kFreeBSD
+ • parse uevent file to detect network device type
+ • allow pulse device to be specified by name
+ • battery: find batteries using glob
+ • tztime: support locales
+ • wireless: use blank padding for quality
+ • add unit tests
+ • fix compilation with -fno-common
+
 2016-01-01 i3status 2.10
 
  • man: fix typo in battery example
diff --git a/I3STATUS_VERSION b/I3STATUS_VERSION
index 8eedd74..0b08ad7 100644
--- a/I3STATUS_VERSION
+++ b/I3STATUS_VERSION
@@ -1 +1 @@
-2.10-non-git
+2.11-non-git
diff --git a/man/asciidoc.conf b/man/asciidoc.conf
index 0d23d6f..4993579 100644
--- a/man/asciidoc.conf
+++ b/man/asciidoc.conf
@@ -7,7 +7,7 @@ template::[header-declarations]
 <refentrytitle>{mantitle}</refentrytitle>
 <manvolnum>{manvolnum}</manvolnum>
 <refmiscinfo class="source">i3status</refmiscinfo>
-<refmiscinfo class="version">v2.10</refmiscinfo>
+<refmiscinfo class="version">v2.11</refmiscinfo>
 <refmiscinfo class="manual">i3 Manual</refmiscinfo>
 </refmeta>
 <refnamediv>
diff --git a/man/i3status.man b/man/i3status.man
index 6318a92..22d51ca 100644
--- a/man/i3status.man
+++ b/man/i3status.man
@@ -1,7 +1,7 @@
 i3status(1)
 ===========
 Michael Stapelberg <michael@i3wm.org>
-v2.10, January 2016
+v2.11, January 2017
 
 == NAME