diff --git a/Changelog b/Changelog
index a531fdce..0c1fd5ee 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,11 @@
+Unreleased:
+- Updated [shairport-sync](https://github.com/mikebrady/shairport-sync) to version 4.2 ([release notes](https://github.com/mikebrady/shairport-sync/releases/tag/4.2)) and as required [nqptp](https://github.com/mikebrady/nqptp) to version 1.2.1 ([release notes](https://github.com/mikebrady/nqptp/releases/tag/1.2.1))
+
+20230404:
+- Fix several DSP bugs
+- Fix screensaver bug
+- Fix UI bug when no samplerate is defined
+
 20230223:
 - DAC+ DSP profile v13 that is compatible with the latest DAC+ DSP hardware
 
@@ -7,7 +15,7 @@
 
 20221109:
 - improve Digi2 Pro detection
-- improve volume control of Amp3/DSP add-on 
+- improve volume control of Amp3/DSP add-on
 
 20221028:
 - Upgrade Linux kernel
@@ -35,7 +43,7 @@
 - Update kernel to 5.10.95
 - Update to buildroot 2021.11
 - Updated shairport-sync
-- audiocontrol2 websocket API by @schnabel 
+- audiocontrol2 websocket API by @schnabel
 - Bugfix: Set host name on MDNS when it changes
 - Bugfix: Shiaport-sync/nqptp
 
@@ -173,7 +181,7 @@
 - support setting maximum volume and mono/stereo mode for non-DSP sound cards
 - equalizer settings: A/B comparisson
 - support delay for DSP channels
-- named listening modes can be stored and activated 
+- named listening modes can be stored and activated
 - added automatic updates
 - improved metadata handling with radio stations
 - Squeezelite: Allow setting server address
@@ -181,7 +189,7 @@
 - Several other bugfixes and improvements
 
 20260226:
-- Bugfix: Spotify configuration 
+- Bugfix: Spotify configuration
 
 20200225:
 - Bugfix: ympd not using IPv6
@@ -262,9 +270,9 @@ Known problems:
 - Bugfix: Digi+ got stuck in previous release
 
 20190926
-- Added a central config file /etc/hifibery.conf that can be used to 
+- Added a central config file /etc/hifibery.conf that can be used to
   configure the whole system
-- Changed sound card reconfiguration that there is no plop sound 
+- Changed sound card reconfiguration that there is no plop sound
   during startup anymore
 - Added MPD web interface
 - Added player web interface
@@ -282,21 +290,21 @@ Known problems:
 - Added MPD
 - DSPToolkit version 0.17
 - Changed init system to use systemd (faster startup)
-- Removed audiocontrol (as it will be replaced by audiocontrol2 
+- Removed audiocontrol (as it will be replaced by audiocontrol2
   in the future)
 
 20181015
-- Added audiocontrol demon to support volume control 
+- Added audiocontrol demon to support volume control
   via rotary controller
-- DSPTookit upgraded to 0.14 which supports log scale 
+- DSPTookit upgraded to 0.14 which supports log scale
   for shairport-sync
 
 20181011
 - Bugfix: DSPToolkit upgraded to 0.13
-- Bugfix: Shairport now working (some libraries were missing in 
+- Bugfix: Shairport now working (some libraries were missing in
   previous version)
 
-20181009 
+20181009
 - added nano to allow editing local files
 - added WiFi support
 
diff --git a/buildroot/package/hifiberry-shairport/hifiberry-shairport.mk b/buildroot/package/hifiberry-shairport/hifiberry-shairport.mk
index e03d7f5e..6f70f65e 100644
--- a/buildroot/package/hifiberry-shairport/hifiberry-shairport.mk
+++ b/buildroot/package/hifiberry-shairport/hifiberry-shairport.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-HIFIBERRY_SHAIRPORT_VERSION = a30c260ec575e6d76d35b72db1343c149ea0772d
+HIFIBERRY_SHAIRPORT_VERSION = b56d55151890ff846a667b50d15e9e6b562144d2
 HIFIBERRY_SHAIRPORT_SITE = $(call github,mikebrady,shairport-sync,$(HIFIBERRY_SHAIRPORT_VERSION))
 
 HIFIBERRY_SHAIRPORT_LICENSE = MIT, BSD-3-Clause
 HIFIBERRY_SHAIRPORT_LICENSE_FILES = LICENSES
-HIFIBERRY_SHAIRPORT_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf avahi 
+HIFIBERRY_SHAIRPORT_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf avahi
 
 # git clone, no configure
 HIFIBERRY_SHAIRPORT_AUTORECONF = YES
@@ -20,7 +20,7 @@ HIFIBERRY_SHAIRPORT_CONF_OPTS = --with-alsa \
         --with-stdout \
         --with-avahi \
         --with-mpris-interface \
-        --with-mpris-test-client 
+        --with-mpris-test-client
 
 HIFIBERRY_SHAIRPORT_CONF_ENV += LIBS="$(HIFIBERRY_SHAIRPORT_CONF_LIBS)"
 
diff --git a/buildroot/package/nqptp/nqptp.mk b/buildroot/package/nqptp/nqptp.mk
index cceb5f75..77e086f5 100644
--- a/buildroot/package/nqptp/nqptp.mk
+++ b/buildroot/package/nqptp/nqptp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NQPTP_VERSION = c71b49a3556ba8547ee28482cb31a97fe99298aa
+NQPTP_VERSION = 57fc7ac20ffd7a04ea5fbed6417e4c658bb7eb68
 NQPTP_SITE = $(call github,mikebrady,nqptp,$(NQPTP_VERSION))
 
 # git clone, no configure