diff --git a/Changes b/Changes
index aed550965..9f305618e 100644
--- a/Changes
+++ b/Changes
@@ -27,6 +27,7 @@ TODO: load must not cache, but global image cache must be cleaned
 TODO: description into --help output?
 TODO: rxvt -help => (see rxvt-XXX(1))?
 TODO: xor_rect should shift right
+TODO: implement iso-8613 38/48 sgr sequences with subparameters
 TODO IMPL: recalc bg only when not fully covering (no alpha, repeat|extend etc..)
 
 TODO IMPL: colour-change event with index
@@ -37,8 +38,9 @@ TODO: warn with a graphical message when env has been modified
 TODO: c&c perl socket via daemon-ext mechanism
 TODO: simplify extension metainfo cache, cache on disk
 TODO: URxvt::Ext::Name installs urxvt ext name and provides pod/manpage for URxvt::Ext::Name
+TODO: üpixel droppins idenrasm,ll,scrollup
 
-9.22 Sun Oct 11 18:23:42 CEST 2015
+9.22 Sat Jan 23 21:07:33 CET 2016
 	- NOTICE: this release updates terminfo.
 	- add terminfo capabilities for various ctrl and shift-ctrl key variants
 	  (patch by Sebastian Schmidt).
diff --git a/README.FAQ b/README.FAQ
index e953d3a30..7be6ffc8a 100644
--- a/README.FAQ
+++ b/README.FAQ
@@ -484,9 +484,12 @@ xterm? I need this to decide about setting colours etc.
     This will keep the default extensions, but disable the two popup
     extensions. Some extensions can also be configured, for example,
     scrollback search mode is triggered by M-s. You can move it to any other
-    combination either by setting the searchable-scrollback resource:
+    combination by adding a keysym resource that binds the desired
+    combination to the "start" action of "searchable-scrollback" and another
+    one that binds M-s to the "builtin:" action:
 
-       URxvt.searchable-scrollback: CM-s
+       URxvt.keysym.CM-s: searchable-scrollback:start
+       URxvt.keysym.M-s: builtin:
 
    The cursor moves when selecting text in the current input line, how do I switch this off?
     See next entry.
@@ -827,8 +830,8 @@ xterm? I need this to decide about setting colours etc.
    I need a termcap file entry.
     One reason you might want this is that some distributions or operating
     systems still compile some programs using the long-obsoleted termcap
-    library (Fedora Core's bash is one example) and rely on a termcap entry
-    for "rxvt-unicode".
+    library (Fedora's bash is one example) and rely on a termcap entry for
+    "rxvt-unicode".
 
     You could use rxvt's termcap entry with reasonable results in many
     cases. You can also create a termcap entry by using terminfo's infocmp
diff --git a/configure b/configure
index 83fbb4bb7..3e3f78bdd 100755
--- a/configure
+++ b/configure
@@ -6447,8 +6447,8 @@ if test x$support_pixbuf = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk-pixbuf-2.0" >&5
 $as_echo_n "checking for gdk-pixbuf-2.0... " >&6; }
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists gdk-pixbuf-2.0; then
-    PIXBUF_CFLAGS="`$PKG_CONFIG gdk-pixbuf-2.0 --cflags`"
-    PIXBUF_LIBS="`$PKG_CONFIG gdk-pixbuf-2.0 --libs`"
+    PIXBUF_CFLAGS="`$PKG_CONFIG --cflags gdk-pixbuf-2.0`"
+    PIXBUF_LIBS="`$PKG_CONFIG --libs gdk-pixbuf-2.0`"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -6477,8 +6477,8 @@ if test x$support_startup_notification = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification-1.0" >&5
 $as_echo_n "checking for libstartup-notification-1.0... " >&6; }
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists libstartup-notification-1.0; then
-    STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG libstartup-notification-1.0 --cflags`"
-    STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG libstartup-notification-1.0 --libs`"
+    STARTUP_NOTIFICATION_CFLAGS="`$PKG_CONFIG --cflags libstartup-notification-1.0`"
+    STARTUP_NOTIFICATION_LIBS="`$PKG_CONFIG --libs libstartup-notification-1.0`"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -6503,8 +6503,8 @@ if test x$support_frills = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmu" >&5
 $as_echo_n "checking for xmu... " >&6; }
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xmu; then
-    XMU_CFLAGS="`$PKG_CONFIG xmu --cflags`"
-    XMU_LIBS="`$PKG_CONFIG xmu --libs`"
+    XMU_CFLAGS="`$PKG_CONFIG --cflags xmu`"
+    XMU_LIBS="`$PKG_CONFIG --libs xmu`"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -7541,8 +7541,8 @@ if test x$support_xft = xyes || test x$support_image = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrender" >&5
 $as_echo_n "checking for xrender... " >&6; }
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists xrender; then
-    XRENDER_CFLAGS="`$PKG_CONFIG xrender --cflags`"
-    XRENDER_LIBS="`$PKG_CONFIG xrender --libs`"
+    XRENDER_CFLAGS="`$PKG_CONFIG --cflags xrender`"
+    XRENDER_LIBS="`$PKG_CONFIG --libs xrender`"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
@@ -7583,8 +7583,8 @@ if test x$support_xft = xyes && test x$rxvt_have_xrender = xyes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig xft" >&5
 $as_echo_n "checking for fontconfig xft... " >&6; }
   if test $PKG_CONFIG != no && $PKG_CONFIG --exists fontconfig xft; then
-    XFT_CFLAGS="`$PKG_CONFIG fontconfig xft --cflags`"
-    XFT_LIBS="`$PKG_CONFIG fontconfig xft --libs`"
+    XFT_CFLAGS="`$PKG_CONFIG --cflags fontconfig xft`"
+    XFT_LIBS="`$PKG_CONFIG --libs fontconfig xft`"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index c6f32cc7e..1f285e54f 100644
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2014-12-31" "@@RXVT_VERSION@@" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2016-01-23" "@@RXVT_VERSION@@" "RXVT-UNICODE"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -465,6 +465,9 @@ Capture system console messages.
 .IX Item "-pt style"
 Compile \fI\s-1XIM\s0\fR: input style for input method; \fBOverTheSpot\fR,
 \&\fBOffTheSpot\fR, \fBRoot\fR; resource \fBpreeditType\fR.
+.Sp
+If the perl extension \f(CW\*(C`xim\-onthespot\*(C'\fR is used (which is the default),
+then additionally the \f(CW\*(C`OnTheSpot\*(C'\fR preedit type is available.
 .IP "\fB\-im\fR \fItext\fR" 4
 .IX Item "-im text"
 Compile \fI\s-1XIM\s0\fR: input method name. resource \fBinputMethod\fR.
@@ -904,8 +907,7 @@ are not passed onto the shell; option \fB\-sk\fR. \fBFalse\fR: do not scroll to
 bottom when a non-special key is pressed; option \fB+sk\fR.
 .IP "\fBsaveLines:\fR \fInumber\fR" 4
 .IX Item "saveLines: number"
-Save \fInumber\fR lines in the scrollback buffer [default 64]. This
-resource is limited on most machines to 65535; option \fB\-sl\fR.
+Save \fInumber\fR lines in the scrollback buffer [default 1000]; option \fB\-sl\fR.
 .IP "\fBinternalBorder:\fR \fInumber\fR" 4
 .IX Item "internalBorder: number"
 Internal border of \fInumber\fR pixels. This resource is limited to 100;
@@ -963,6 +965,11 @@ Mouse pointer foreground colour.
 .IP "\fBpointerColor2:\fR \fIcolour\fR" 4
 .IX Item "pointerColor2: colour"
 Mouse pointer background colour.
+.IP "\fBpointerShape:\fR \fIstring\fR" 4
+.IX Item "pointerShape: string"
+Compile \fIfrills\fR: Specifies the name of the mouse pointer shape
+[default \fBxterm\fR]. See the macros in the \fBX11/cursorfont.h\fR include
+file for possible values (omit the \f(CW\*(C`XC_\*(C'\fR prefix).
 .IP "\fBpointerBlankDelay:\fR \fInumber\fR" 4
 .IX Item "pointerBlankDelay: number"
 Specifies number of seconds before blanking the pointer [default 2]. Use a
@@ -994,7 +1001,7 @@ be used. If not specified, the built-in default is used:
 \&\fB\s-1BACKSLASH\s0 `"'&()*,;<=>?@[]^{|}\fR
 .IP "\fBpreeditType:\fR \fIstyle\fR" 4
 .IX Item "preeditType: style"
-\&\fBOverTheSpot\fR, \fBOffTheSpot\fR, \fBRoot\fR; option \fB\-pt\fR.
+\&\fBOnTheSpot\fR, \fBOverTheSpot\fR, \fBOffTheSpot\fR, \fBRoot\fR; option \fB\-pt\fR.
 .IP "\fBinputMethod:\fR \fIname\fR" 4
 .IX Item "inputMethod: name"
 \&\fIname\fR of inputMethod to use; option \fB\-im\fR.
diff --git a/doc/rxvt.7.man.in b/doc/rxvt.7.man.in
index a59abffb0..14b0c0ab7 100644
--- a/doc/rxvt.7.man.in
+++ b/doc/rxvt.7.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 7"
-.TH @@RXVT_NAME@@ 7 "2014-12-31" "@@RXVT_VERSION@@" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 7 "2016-01-23" "@@RXVT_VERSION@@" "RXVT-UNICODE"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -747,10 +747,13 @@ this \fBperl-ext-common\fR resource:
 This will keep the default extensions, but disable the two popup
 extensions. Some extensions can also be configured, for example,
 scrollback search mode is triggered by \fBM\-s\fR. You can move it to any
-other combination either by setting the \fBsearchable-scrollback\fR resource:
+other combination by adding a \fBkeysym\fR resource that binds the desired
+combination to the \f(CW\*(C`start\*(C'\fR action of \f(CW\*(C`searchable\-scrollback\*(C'\fR and another
+one that binds \fBM\-s\fR to the \f(CW\*(C`builtin:\*(C'\fR action:
 .PP
-.Vb 1
-\&   URxvt.searchable\-scrollback: CM\-s
+.Vb 2
+\&   URxvt.keysym.CM\-s: searchable\-scrollback:start
+\&   URxvt.keysym.M\-s: builtin:
 .Ve
 .PP
 \fIThe cursor moves when selecting text in the current input line, how do I switch this off?\fR
@@ -1168,7 +1171,7 @@ See next entry.
 .PP
 One reason you might want this is that some distributions or operating
 systems still compile some programs using the long-obsoleted termcap
-library (Fedora Core's bash is one example) and rely on a termcap entry
+library (Fedora's bash is one example) and rely on a termcap entry
 for \f(CW\*(C`rxvt\-unicode\*(C'\fR.
 .PP
 You could use rxvt's termcap entry with reasonable results in many cases.
diff --git a/doc/rxvtc.1.man.in b/doc/rxvtc.1.man.in
index 687ed6b1f..9c7ff9521 100644
--- a/doc/rxvtc.1.man.in
+++ b/doc/rxvtc.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2014-12-31" "@@RXVT_VERSION@@" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2016-01-23" "@@RXVT_VERSION@@" "RXVT-UNICODE"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/doc/rxvtd.1.man.in b/doc/rxvtd.1.man.in
index 40a908ee4..519b91da8 100644
--- a/doc/rxvtd.1.man.in
+++ b/doc/rxvtd.1.man.in
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.30)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "@@RXVT_NAME@@ 1"
-.TH @@RXVT_NAME@@ 1 "2014-12-31" "@@RXVT_VERSION@@" "RXVT-UNICODE"
+.TH @@RXVT_NAME@@ 1 "2016-01-23" "@@RXVT_VERSION@@" "RXVT-UNICODE"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff --git a/src/version.h b/src/version.h
index fdffcb510..d82a1f3a6 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 // VERSION _must_ be \d.\d+
 #define VERSION "9.22"
-#define DATE	"2015-10-11"
+#define DATE	"2016-01-23"