diff --git a/gottengeography-ubuntu-ppa-xenial.list b/gottengeography-ubuntu-ppa-xenial.list
deleted file mode 100644
index 2cc64eb..0000000
--- a/gottengeography-ubuntu-ppa-xenial.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/gottengeography/ppa/ubuntu xenial main
-# deb-src http://ppa.launchpad.net/gottengeography/ppa/ubuntu xenial main
diff --git a/gottengeography-ubuntu-ppa-yakkety.list b/gottengeography-ubuntu-ppa-yakkety.list
new file mode 100644
index 0000000..9cab2bc
--- /dev/null
+++ b/gottengeography-ubuntu-ppa-yakkety.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/gottengeography/ppa/ubuntu yakkety main
+# deb-src http://ppa.launchpad.net/gottengeography/ppa/ubuntu yakkety main
diff --git a/lutris.list b/lutris.list
index bce94d2..b95f4d1 100644
--- a/lutris.list
+++ b/lutris.list
@@ -1,3 +1,3 @@
-# wget -q http://download.opensuse.org/repositories/home:/strycore/xUbuntu_16.04/Release.key -O- | sudo apt-key add -
-deb http://download.opensuse.org/repositories/home:/strycore/xUbuntu_16.04/ ./
+# wget -q http://download.opensuse.org/repositories/home:/strycore/xUbuntu_16.10/Release.key -O- | sudo apt-key add -
+deb http://download.opensuse.org/repositories/home:/strycore/xUbuntu_16.10/ ./
 
diff --git a/mariadb-xenial.list b/mariadb-yakkety.list
similarity index 56%
rename from mariadb-xenial.list
rename to mariadb-yakkety.list
index 3bce962..2c2e339 100644
--- a/mariadb-xenial.list
+++ b/mariadb-yakkety.list
@@ -1,4 +1,4 @@
 # sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
-#deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu xenial main
-deb [arch=amd64,i386] http://mirror.netcologne.de/mariadb/repo/10.1/ubuntu xenial main
+# deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu yakkety main
+deb [arch=amd64,i386] http://mirror.netcologne.de/mariadb/repo/10.1/ubuntu yakkety main
 
diff --git a/musicbrainz-developers-daily-xenial.list b/musicbrainz-developers-daily-yakkety.list
similarity index 84%
rename from musicbrainz-developers-daily-xenial.list
rename to musicbrainz-developers-daily-yakkety.list
index 6474a2a..2dd530a 100644
--- a/musicbrainz-developers-daily-xenial.list
+++ b/musicbrainz-developers-daily-yakkety.list
@@ -1,3 +1,3 @@
 # MusicBrainz Picard (daily/unstable) PPA, Key 0xCEDF0F40
-deb http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu xenial main
-# deb-src http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu xenial main
+deb http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu yakkety main
+# deb-src http://ppa.launchpad.net/musicbrainz-developers/daily/ubuntu yakkety main
diff --git a/retroshare-ubuntu-unstable-xenial.list b/retroshare-ubuntu-unstable-xenial.list
deleted file mode 100644
index f14240b..0000000
--- a/retroshare-ubuntu-unstable-xenial.list
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ppa.launchpad.net/retroshare/unstable/ubuntu xenial main
-# deb-src http://ppa.launchpad.net/retroshare/unstable/ubuntu xenial main
diff --git a/retroshare-ubuntu-unstable-yakkety.list b/retroshare-ubuntu-unstable-yakkety.list
new file mode 100644
index 0000000..6e1d687
--- /dev/null
+++ b/retroshare-ubuntu-unstable-yakkety.list
@@ -0,0 +1,2 @@
+deb http://ppa.launchpad.net/retroshare/unstable/ubuntu yakkety main
+# deb-src http://ppa.launchpad.net/retroshare/unstable/ubuntu yakkety main
diff --git a/webupd8team-puddletag-xenial.list b/webupd8team-puddletag-xenial.list
deleted file mode 100644
index 7a4cf1b..0000000
--- a/webupd8team-puddletag-xenial.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu xenial main
diff --git a/webupd8team-puddletag-yakkety.list b/webupd8team-puddletag-yakkety.list
new file mode 100644
index 0000000..ddc6dcb
--- /dev/null
+++ b/webupd8team-puddletag-yakkety.list
@@ -0,0 +1 @@
+deb http://ppa.launchpad.net/webupd8team/puddletag/ubuntu yakkety main