diff --git a/CMakeLists.txt b/CMakeLists.txt
index fefbde0f8..1f9ca1ef8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.6)
 project(rtags)
 set(RTAGS_VERSION_MAJOR 2)
-set(RTAGS_VERSION_MINOR 20)
+set(RTAGS_VERSION_MINOR 21)
 set(RTAGS_VERSION_DATABASE 126)
 set(RTAGS_VERSION_SOURCES_FILE 14)
 set(RTAGS_VERSION ${RTAGS_VERSION_MAJOR}.${RTAGS_VERSION_MINOR}.${RTAGS_VERSION_DATABASE})
diff --git a/man/man7/rc.7 b/man/man7/rc.7
index aa34936cf..61b624d1c 100644
--- a/man/man7/rc.7
+++ b/man/man7/rc.7
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH RC "7" "July 2018" "rc 2.18.126" "User Commands"
+.TH RC "7" "November 2018" "rc 2.21.126" "User Commands"
 .SH NAME
-rc \- manual page for rc 2.18.126
+rc \- manual page for rc 2.21.126
 .SH SYNOPSIS
 rc [OPTION]...
 .SH DESCRIPTION
@@ -15,7 +15,7 @@ Be more verbose.
 \fB\-\-version\fR
 Print current version.
 .TP
-\fB\-\-verify\-version\fR [arg]
+\fB\-\-verify\-version\fR|\-t [arg]
 Verify that the correct protocol version is used.
 .TP
 \fB\-\-silent\fR|\-Q
diff --git a/man/man7/rdm.7 b/man/man7/rdm.7
index 64fa3ffda..b20357e8f 100644
--- a/man/man7/rdm.7
+++ b/man/man7/rdm.7
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH RDM "7" "July 2018" "rdm 2.18.126" "User Commands"
+.TH RDM "7" "November 2018" "rdm 2.21.126" "User Commands"
 .SH NAME
-rdm \- manual page for rdm 2.18.126
+rdm \- manual page for rdm 2.21.126
 .SH SYNOPSIS
 rdm [OPTION]...
 .SH DESCRIPTION
@@ -72,12 +72,12 @@ Change verbosity, multiple \fB\-v\fR's are allowed.
 \fB\-\-job\-count\fR|\-j [arg]
 Spawn this many concurrent processes for indexing.
 .TP
-\fB\-\-header\-error\-job\-count\fR|\-H [arg]
-Allow this many concurrent header error jobs (default std::max(1, \fB\-\-job\-count\fR / 2)).
-.TP
 \fB\-\-test\fR|\-t [arg]
 Run this test.
 .TP
+\fB\-\-tempdir\fR [arg]
+Use this directory for temporary files. Clang generates a lot of these and rtags will periodically clean out this directory. Default is $TMPDIR/rtags/
+.TP
 \fB\-\-test\-timeout\fR|\-z [arg]
 Timeout for test to complete.
 .TP
@@ -179,6 +179,9 @@ Don't filter private members and destructors from completions.
 \fB\-\-completion\-logs\fR
 Log more info about completions.
 .TP
+\fB\-\-completion\-diagnostics\fR
+Send diagnostics from completion thread.
+.TP
 \fB\-\-max\-include\-completion\-depth\fR [arg]
 Max recursion depth for header completion (default 3).
 .TP
@@ -221,9 +224,6 @@ Use arg to transform arguments. [arg] should be executable with (execv(3)).
 \fB\-\-no\-comments\fR
 Don't parse/store doxygen comments.
 .TP
-\fB\-\-launchd\fR
-Run as a launchd job (use launchd API to retrieve socket opened by launchd on rdm's behalf).
-.TP
 \fB\-\-inactivity\-timeout\fR [arg]
 Time in seconds after which rdm will quit if there's been no activity (N.B., once rdm has quit, something will need to re\-run it!).
 .TP
diff --git a/src/rtags.el b/src/rtags.el
index 2e493cc96..5160ee1cb 100644
--- a/src/rtags.el
+++ b/src/rtags.el
@@ -5,7 +5,7 @@
 ;; Author: Jan Erik Hanssen <jhanssen@gmail.com>
 ;;         Anders Bakken <agbakken@gmail.com>
 ;; URL: http://rtags.net
-;; Version: 2.10
+;; Version: 2.21
 
 ;; This file is not part of GNU Emacs.
 
@@ -73,7 +73,7 @@
 ;; Constants
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defconst rtags-protocol-version 127)
-(defconst rtags-package-version "2.20")
+(defconst rtags-package-version "2.21")
 (defconst rtags-popup-available (require 'popup nil t))
 (defconst rtags-supported-major-modes '(c-mode c++-mode objc-mode) "Major modes RTags supports.")
 (defconst rtags-verbose-results-delimiter "------------------------------------------")