diff --git a/client-android b/client-android
index 2246c0435b7d83f89880c82cf6d223d5fa4de1fc..61441225a41cf5c1ad36021f450e330f9b28603e 160000
--- a/client-android
+++ b/client-android
@@ -1 +1 @@
-Subproject commit 2246c0435b7d83f89880c82cf6d223d5fa4de1fc
+Subproject commit 61441225a41cf5c1ad36021f450e330f9b28603e
diff --git a/client-gnome b/client-gnome
index 55d2473091d51af06b133b6ce46aafda9ec84fb1..d7dd3deca55c5ef3e51483ef4699172638ef0305 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit 55d2473091d51af06b133b6ce46aafda9ec84fb1
+Subproject commit d7dd3deca55c5ef3e51483ef4699172638ef0305
diff --git a/client-macosx b/client-macosx
index 022b57a6fb75af3bf89f33bcc62ecfaa9e4184e6..c8035c6f0798336b97a3cbd5c56868c990ca2c6e 160000
--- a/client-macosx
+++ b/client-macosx
@@ -1 +1 @@
-Subproject commit 022b57a6fb75af3bf89f33bcc62ecfaa9e4184e6
+Subproject commit c8035c6f0798336b97a3cbd5c56868c990ca2c6e
diff --git a/daemon b/daemon
index 08d0c72785c07f8384484ecbfdb2040ef81d2d18..9630c15e27123e40794bd5e0eeaf51e828732091 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 08d0c72785c07f8384484ecbfdb2040ef81d2d18
+Subproject commit 9630c15e27123e40794bd5e0eeaf51e828732091
diff --git a/lrc b/lrc
index 760497e80f73f46e655f9e7e47a922b92f4fe0ae..9470ab5f343900b96ea2ed27694c49e83a71ad6c 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 760497e80f73f46e655f9e7e47a922b92f4fe0ae
+Subproject commit 9470ab5f343900b96ea2ed27694c49e83a71ad6c
diff --git a/packaging/rules/debian-one-click-install/ring-all.postinst b/packaging/rules/debian-one-click-install/ring-all.postinst
index c883f3d590984d1bd1c2530c14a80c1e2cf2a4ea..4cb49e7933a4b34a4ce9bc190704b5340a576194 100755
--- a/packaging/rules/debian-one-click-install/ring-all.postinst
+++ b/packaging/rules/debian-one-click-install/ring-all.postinst
@@ -73,7 +73,7 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # In general: you will not need to modify these variables.
 # WARNING: When modifying the paths, keep in mind that the corresponding
 # postrm paths should be modified as well
-APT_FILE="/etc/apt/sources.list.d/ring-main.sources"
+APT_FILE="/etc/apt/sources.list.d/ring-main.list"
 UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
 RING_UPDATE_MANAGER_ID="ring-main"
 
@@ -131,15 +131,7 @@ EOF
             # Add an entry for the package repository to the trusted package
             # sources (DEB822 format)
             cat > $APT_FILE <<EOF
-# This file makes sure that Ring is kept up-to-date
-# as part of regular system upgrades
-
-Types: deb
-URIs: $RING_REPO
-Suites: ring
-Architectures: i386 amd64
-Components: main
-Signed-By: $RING_KEY_FINGERPRINT
+deb ${RING_REPO} ring main
 EOF
 
             # Additionally, if update manager is installed we inform it about