diff --git a/Makefile.in b/Makefile.in
index a0ece0cd..4217c931 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -951,9 +951,9 @@ git_hash.h: FORCE
 FORCE:
 
 # example build line
-# make CFLAGS="-O2 -s -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fdebug-prefix-map=$(pwd)=." CXXFLAGS='$(CFLAGS)' V=1
+# make CFLAGS="-O2 -s -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -ffile-prefix-map=$(pwd)=" CXXFLAGS='$(CFLAGS)' V=1
 # V=1 to show lines
-# debug-prefix-map to filter out absolute path lines in binary
+# file-prefix-map to filter out absolute path lines in binary
 #
 debug:
 	$(MAKE) all CFLAGS="-Wno-unused-parameter @DEBUG@"
diff --git a/NEWS b/NEWS
index 7e840f0f..0af18b53 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,34 @@ Feature differences from Xiph release
 
 any extra tags are shown in the conf/icecast.xml.dist file
 
+2.4.0.kh22
+. auth processing update
+  . url engine uses separate timers for the request types.
+  . small changes to messaging and timeouts
+. fix 404 case from cache starvation.
+. fix stats crash bug from source restart.
+. Relay restart uses a time marker to allow more error case handling
+. range handling updates.
+. fix lock bug on file stats
+. add listenurl to mount block (generated previously), this is sent to YP.
+. trick for safari only (redirect to same url with random code param) to
+  workaround a caching issue.
+. Allow FLV metadata blocks to resize if excessive tags added.
+. worker processing fixes from previous release
+. revert various spin locks to mutexes.
+. small http processing updates
+. log update
+  . split locking, allows for more concurrency.
+  . level can be the original numbers, names or keywords eg subsec for subseconds
+    debug=300, info=100 to keep N lines in that category.
+  . extracting info from core file made easier if need arises.
+  . missed timestamps in showlog, and timestamps can be in millisecs
+  . add level param to showlog to allow just that level up, default is the xml setting
+  . add history tag in logs, like display, overridden by possble level settings
+. drop the corner images, use css to achieve the same thing without the extra requests
+. include a DLL to help the shipped DLLs (eg libcurl) use older windows releases.
+. various internal code cleanups.
+
 2.4.0.kh21
 . Worker update. introduce 2 queues per worker for client processing, fast and
   normal. fast being used for immediate scheduling. The processing routines no longer
diff --git a/configure b/configure
index 2c8b1c95..20963810 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh21.8.
+# Generated by GNU Autoconf 2.71 for Icecast 2.4.0-kh22.
 #
 # Report bugs to <karl@kheyes.plus.com>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Icecast'
 PACKAGE_TARNAME='icecast'
-PACKAGE_VERSION='2.4.0-kh21.8'
-PACKAGE_STRING='Icecast 2.4.0-kh21.8'
+PACKAGE_VERSION='2.4.0-kh22'
+PACKAGE_STRING='Icecast 2.4.0-kh22'
 PACKAGE_BUGREPORT='karl@kheyes.plus.com'
 PACKAGE_URL=''
 
@@ -1434,7 +1434,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Icecast 2.4.0-kh21.8 to adapt to many kinds of systems.
+\`configure' configures Icecast 2.4.0-kh22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1505,7 +1505,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Icecast 2.4.0-kh21.8:";;
+     short | recursive ) echo "Configuration of Icecast 2.4.0-kh22:";;
    esac
   cat <<\_ACEOF
 
@@ -1639,7 +1639,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Icecast configure 2.4.0-kh21.8
+Icecast configure 2.4.0-kh22
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2193,7 +2193,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Icecast $as_me 2.4.0-kh21.8, which was
+It was created by Icecast $as_me 2.4.0-kh22, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3680,7 +3680,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='icecast'
- VERSION='2.4.0-kh21.8'
+ VERSION='2.4.0-kh22'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -21645,7 +21645,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Icecast $as_me 2.4.0-kh21.8, which was
+This file was extended by Icecast $as_me 2.4.0-kh22, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21713,7 +21713,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-Icecast config.status 2.4.0-kh21.8
+Icecast config.status 2.4.0-kh22
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index ac6a3473..8d8f5363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([Icecast], [2.4.0-kh21.8], [karl@kheyes.plus.com])
+AC_INIT([Icecast], [2.4.0-kh22], [karl@kheyes.plus.com])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])