diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 303e9245a0..65e7477303 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -1,11 +1,11 @@
 Provides:org.sufficientlysecure.adaway
 Categories:System,Security
 License:GPLv3
-Web Site:http://sufficientlysecure.org/index.php/adaway
-Source Code:https://github.com/dschuermann/ad-away
-Issue Tracker:https://github.com/dschuermann/ad-away/issues
-Changelog:https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG
-Donate:http://sufficientlysecure.org/index.php/adaway
+Web Site:http://www.adaway.org
+Source Code:https://github.com/Free-Software-for-Android/AdAway
+Issue Tracker:https://github.com/Free-Software-for-Android/AdAway/issues
+Changelog:https://github.com/Free-Software-for-Android/ad-away/raw/HEAD/CHANGELOG
+Donate:http://www.adaway.org
 FlattrID:369138
 
 Auto Name:AdAway
@@ -25,7 +25,7 @@ read-only.
 Requires Root:yes
 
 Repo Type:git
-Repo:https://github.com/dschuermann/ad-away.git
+Repo:https://github.com/Free-Software-for-Android/AdAway.git
 
 Build:1.12,13
     commit=ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9
diff --git a/metadata/org.fastergps.txt b/metadata/org.fastergps.txt
index 0a9d05b903..6b5986bd88 100644
--- a/metadata/org.fastergps.txt
+++ b/metadata/org.fastergps.txt
@@ -1,9 +1,9 @@
 Categories:System
 License:GPLv3
-Web Site:http://sufficientlysecure.org/index.php/android-apps/#fastergps
-Source Code:https://github.com/dschuermann/faster-gps
-Issue Tracker:https://github.com/dschuermann/faster-gps/issues
-Donate:http://sufficientlysecure.org/index.php/android-apps/#fastergps
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/Free-Software-for-Android/FasterGPS
+Issue Tracker:https://github.com/Free-Software-for-Android/FasterGPS/issues
+Donate:http://www.sufficientlysecure.org/android
 FlattrID:527132
 
 Auto Name:FasterGPS
@@ -25,7 +25,7 @@ Requires root: Yes. To write gps.conf file to /system partition.
 Requires Root:yes
 
 Repo Type:git
-Repo:https://github.com/dschuermann/faster-gps.git
+Repo:https://github.com/Free-Software-for-Android/FasterGPS.git
 
 Build:1.0,1
     commit=90430ede39c5ad4fef338744af954f865b246c41
diff --git a/metadata/org.ntpsync.txt b/metadata/org.ntpsync.txt
index 4a9dfda832..f3762271a4 100644
--- a/metadata/org.ntpsync.txt
+++ b/metadata/org.ntpsync.txt
@@ -1,9 +1,9 @@
 Categories:System
 License:GPLv3
-Web Site:http://sufficientlysecure.org/index.php/android-apps/#ntpsync
-Source Code:https://github.com/dschuermann/ntp-sync
-Issue Tracker:https://github.com/dschuermann/ntp-sync/issues
-Donate:http://sufficientlysecure.org/index.php/android-apps/#ntpsync
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/free-software-for-android/NTPSync
+Issue Tracker:https://github.com/free-software-for-android/NTPSync/issues
+Donate:http://www.sufficientlysecure.org/android
 FlattrID:669294
 
 Auto Name:NTPSync
@@ -16,7 +16,7 @@ time root is needed.
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/ntp-sync.git
+Repo:https://github.com/free-software-for-android/NTPSync.git
 
 Build:1.0,1
     commit=038ddd0d3e822c535339a2ef1ca513810ff15fd3
diff --git a/metadata/org.sufficientlysecure.ical.txt b/metadata/org.sufficientlysecure.ical.txt
index 8729229e83..37721cdf36 100644
--- a/metadata/org.sufficientlysecure.ical.txt
+++ b/metadata/org.sufficientlysecure.ical.txt
@@ -1,25 +1,27 @@
 Categories:Time
 License:GPLv3
-Web Site:http://sufficientlysecure.org
-Source Code:https://github.com/dschuermann/ical-import-export
-Issue Tracker:https://github.com/dschuermann/ical-import-export/issues
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/SufficientlySecure/calendar-import-export
+Issue Tracker:https://github.com/SufficientlySecure/calendar-import-export/issues
+Donate:http://www.sufficientlysecure.org/android
 
-Auto Name:iCal Import/Export
-Summary:Import and export calendar data via ical files
+Auto Name:Calendar Import/Export
+Summary:Import/Export calendars via ics files
 Description:
-Import and export calendar data via ical files.
+This app allows you to import/export your calenders using ics files
+without using Google synchronization services.
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/ical-import-export.git
+Repo:https://github.com/SufficientlySecure/calendar-import-export.git
 
-Build:1.5,48
-    disable=upstream says 'not ready'
-    commit=ed9d4c21740c2e921e2e4736df624bda74020db2
-    subdir=iCalImportExport
+Build:2.0,50
+    commit=v2.0
+    subdir=CalendarImportExport
+    gradle=yes
 
-Auto Update Mode:None
-Update Check Mode:RepoManifest
-Current Version:1.5
-Current Version Code:48
+Auto Update Mode:Version v%v
+Update Check Mode:Tags
+Current Version:2.0
+Current Version Code:50
 
diff --git a/metadata/org.sufficientlysecure.keychain.txt b/metadata/org.sufficientlysecure.keychain.txt
index 35eef6825e..fcd88b468b 100644
--- a/metadata/org.sufficientlysecure.keychain.txt
+++ b/metadata/org.sufficientlysecure.keychain.txt
@@ -1,8 +1,9 @@
 Categories:Internet
 License:GPLv3+
-Web Site:http://openkeychain.org
-Source Code:https://github.com/open-keychain/open-keychain
-Issue Tracker:https://github.com/open-keychain/open-keychain/issues
+Web Site:http://www.openkeychain.org
+Source Code:https://github.com/openpgp-keychain/openpgp-keychain
+Issue Tracker:https://github.com/openpgp-keychain/openpgp-keychain/issues
+Donate:http://www.openkeychain.org
 Changelog:https://github.com/open-keychain/open-keychain/blob/HEAD/OpenKeychain/src/main/res/raw/help_changelog.md
 
 Auto Name:OpenKeychain
@@ -25,7 +26,9 @@ OpenKeychain integrates with
 
 * K-9 Mail
 * Conversations
-* and many more...
+* Password Store
+* oandbackup
+* and many more…
 
 OpenKeychain is designed to be trustworthy. It’s Free Software with no
 secrets; anyone can examine and validate every bit of it.
diff --git a/metadata/org.sufficientlysecure.localcalendar.txt b/metadata/org.sufficientlysecure.localcalendar.txt
index 5390355291..385e270bd8 100644
--- a/metadata/org.sufficientlysecure.localcalendar.txt
+++ b/metadata/org.sufficientlysecure.localcalendar.txt
@@ -1,24 +1,22 @@
 Categories:Time
 License:GPLv3
-Web Site:http://sufficientlysecure.org/index.php/android-apps/#offline
-Source Code:https://github.com/dschuermann/local-calendar
-Issue Tracker:https://github.com/dschuermann/local-calendar/issues
-Changelog:https://raw.github.com/dschuermann/offline-calendar/HEAD/CHANGELOG
-Donate:http://sufficientlysecure.org/index.php/android-apps/#offline
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/SufficientlySecure/offline-calendar
+Issue Tracker:https://github.com/SufficientlySecure/offline-calendar/issues
+Donate:http://www.sufficientlysecure.org/android
+Changelog:https://raw.github.com/SufficientlySecure/offline-calendar/master/CHANGELOG
 
 Auto Name:Offline Calendar
-Summary:Local calendar adapter
+Summary:Offline calendar adapter
 Description:
-Lets you add local calendars to the Calendar app, which are not synchronized and
-are accessible only on the device itself. Create the calendar in this app and it
-will then be available in the Calendar app.
+Lets you add offline calendars to the Calendar app, which are not synchronized
+and are accessible only on the device itself. Create the calendar in this app
+and it will then be available in the Calendar app.
 
-Based on [https://code.google.com/p/private-calendar Private Calendar] by Harald
-Seltner; improved to work on Android 2.2 and above.
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/local-calendar.git
+Repo:https://github.com/SufficientlySecure/offline-calendar.git
 
 Build:1.0,1
     commit=189ea0113f896515826d33f6cc0041c344a11159
@@ -65,4 +63,3 @@ Auto Update Mode:Version v%v
 Update Check Mode:Tags
 Current Version:1.7
 Current Version Code:8
-
diff --git a/metadata/org.sufficientlysecure.standalonecalendar.txt b/metadata/org.sufficientlysecure.standalonecalendar.txt
index 16700e6154..e86e128575 100644
--- a/metadata/org.sufficientlysecure.standalonecalendar.txt
+++ b/metadata/org.sufficientlysecure.standalonecalendar.txt
@@ -1,8 +1,8 @@
 Categories:System,Time
 License:Apache2
-Web Site:
-Source Code:https://github.com/dschuermann/standalone-calendar
-Issue Tracker:https://github.com/dschuermann/standalone-calendar/issues
+Web Site:https://github.com/free-software-for-android/Standalone-Calendar
+Source Code:https://github.com/free-software-for-android/Standalone-Calendar
+Issue Tracker:https://github.com/free-software-for-android/Standalone-Calendar/issues
 
 Auto Name:Standalone Calendar
 Summary:AOSP calendar
@@ -13,7 +13,7 @@ but can't. It has a different package name to prevent conflicting with
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/standalone-calendar.git
+Repo:https://github.com/free-software-for-android/Standalone-Calendar.git
 
 Build:standalone-1.2,3
     commit=standalone-1.2
diff --git a/metadata/org.sufficientlysecure.viewer.fontpack.txt b/metadata/org.sufficientlysecure.viewer.fontpack.txt
index 1e42fb0748..3112c7d4c3 100644
--- a/metadata/org.sufficientlysecure.viewer.fontpack.txt
+++ b/metadata/org.sufficientlysecure.viewer.fontpack.txt
@@ -1,8 +1,10 @@
 Categories:Reading
 License:GPLv3
 Web Site:
-Source Code:https://github.com/dschuermann/document-viewer-fontpack
-Issue Tracker:https://github.com/dschuermann/document-viewer-fontpack/issues
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/SufficientlySecure/document-viewer-fontpack
+Issue Tracker:https://github.com/SufficientlySecure/document-viewer/issues
+Donate:http://www.sufficientlysecure.org/android
 
 Name:Document Viewer Font Pack
 Auto Name:DV FontPack
@@ -12,7 +14,7 @@ Academy, Academy Old, FreeFonts, URW Symbol and Free Nimbus L.
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/document-viewer-fontpack
+Repo:https://github.com/SufficientlySecure/document-viewer-fontpack
 
 Build:2.1,2100
     commit=ac9b11451
diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index 7f31680df1..db0d0ca3b7 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -1,14 +1,15 @@
 Categories:Reading
 License:GPLv3
 Web Site:
-Source Code:https://github.com/dschuermann/document-viewer
-Issue Tracker:https://github.com/dschuermann/document-viewer/issues
+Web Site:http://www.sufficientlysecure.org/android
+Source Code:https://github.com/SufficientlySecure/document-viewer
+Issue Tracker:https://github.com/SufficientlySecure/document-viewer/issues
+Donate:http://www.sufficientlysecure.org/android
 
 Auto Name:Document Viewer
 Summary:Viewer for many document formats
 Description:
-Document Viewer is a fork of the last GPL version of
-[https://code.google.com/p/ebookdroid EBookDroid]. Supports:
+Document Viewer supports:
 
 * PDF
 * DjVu
@@ -20,7 +21,7 @@ This apk supports all ABIs: ARM, x86 and MIPS.
 .
 
 Repo Type:git
-Repo:https://github.com/dschuermann/document-viewer.git
+Repo:https://github.com/SufficientlySecure/document-viewer.git
 
 Build:2.1,2100
     commit=v2.1