diff --git a/CommonInstaller b/CommonInstaller
index a282fb1f..c8d70edd 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -714,7 +714,8 @@ detect_arch () {
 		24 | 25 )	GSYNC_VER=N	;;
 		26 | 27 )	GSYNC_VER=O	;;
 		28 )		GSYNC_VER=P	;;
-		29 | 30 )	GSYNC_VER=Q	;;
+		29 )		GSYNC_VER=Q	;;
+		30 )		GSYNC_VER=R ;;
 		* )	GSYNC_UNSUPPORTED=1	;;
 	esac
 
diff --git a/data/build-package.database b/data/build-package.database
index 78763e19..e5ab9625 100644
--- a/data/build-package.database
+++ b/data/build-package.database
@@ -169,6 +169,9 @@ file_database=(
 	${appsfolder[5]}/Q/app/GoogleCalendarSync/GoogleCalendarSync.apk.zst
 	${appsfolder[5]}/Q/app/GoogleContactsSync/GoogleContactsSync.apk.zst
 	${appsfolder[5]}/Q/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.zst
+	${appsfolder[5]}/R/app/GoogleCalendarSync/GoogleCalendarSync.apk.zst
+	${appsfolder[5]}/R/app/GoogleContactsSync/GoogleContactsSync.apk.zst
+	${appsfolder[5]}/R/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.zst
 
 	${appsfolder[11]}/app/BromiteWebView_arm/BromiteWebView_arm.apk.zst
 	${appsfolder[11]}/app/BromiteWebView_arm64/BromiteWebView_arm64.apk.zst
diff --git a/data/build-package.download b/data/build-package.download
index cc1dcf47..25bd0e35 100644
--- a/data/build-package.download
+++ b/data/build-package.download
@@ -309,14 +309,18 @@ grab_apk_from_ogapps () {
 		26 ) local api_letter=O ;;
 		28 ) local api_letter=P ;;
 		29 ) local api_letter=Q ;;
+		30 ) local api_letter=R ;;
 	esac
 
 	case "${1}" in
 		"com.google.android.syncadapters.calendar" )
 			# use SDK 19 Calendar Syncadapter for SDK 19
 			# use SDK 21 Calendar Syncadapter for SDK 21 - 29
+			# use SDK 30 Calendar Syncadapter for SDK 30
 			if [ "${4}" -eq 19 ]; then
 				local apk_url="${repo_ogapps}/all/raw/master/${2}/${1}/15/nodpi/2015080710.apk"
+			elif [ "${4}" -eq 30 ]; then
+				local apk_url="${repo_ogapps}/all/raw/master/${2}/${1}/30/nodpi/2017005136.apk"
 			else	local apk_url="${repo_ogapps}/all/raw/master/${2}/${1}/21/nodpi/2016267990.apk"
 			fi
 		;;
@@ -326,8 +330,8 @@ grab_apk_from_ogapps () {
 		;;
 
 		"com.google.android.backuptransport" )
-			# Use SDK 28 Backuptransport on SDK 29 aswell
-			if [ "${4}" -eq 29 ]; then
+			# Use SDK 28 Backuptransport on SDK 29 - 30
+			if [ "${4}" -ge 29 ]; then
 				local apk_url="${repo_ogapps}/all/raw/master/${2}/${1}/28/nodpi/28.apk"
 			else	local apk_url="${repo_ogapps}/all/raw/master/${2}/${1}/${4}/nodpi/${4}.apk"
 			fi
diff --git a/data/build-package.update b/data/build-package.update
index 24c4c781..37081d6d 100644
--- a/data/build-package.update
+++ b/data/build-package.update
@@ -76,7 +76,7 @@ update_microg () {
 
 grab_gsync () {
 	#          KK LL M  N  O  P  Q
-	for API in 19 21 23 24 26 28 29; do
+	for API in 19 21 23 24 26 28 29 30; do
 		grab_apk_from_ogapps ${og_CALSYNC[@]} ${API}
 		grab_apk_from_ogapps ${og_CONSYNC[@]} ${API}
 		grab_apk_from_ogapps ${og_BTRANSP[@]} ${API}