diff --git a/metadata/org.herac.tuxguitar.android.application.yml b/metadata/org.herac.tuxguitar.android.application.yml
new file mode 100644
index 0000000000..f175acd4f4
--- /dev/null
+++ b/metadata/org.herac.tuxguitar.android.application.yml
@@ -0,0 +1,71 @@
+AntiFeatures:
+  - UpstreamNonFree
+Categories:
+  - Multimedia
+  - Writing
+License: LGPL-2.1-only
+WebSite: http://tuxguitar.com.ar/
+SourceCode: https://sourceforge.net/p/tuxguitar/code/
+IssueTracker: https://sourceforge.net/p/tuxguitar/bugs/
+Donate: http://tuxguitar.com.ar/donate.html
+
+Summary: TuxGuitar is a multitrack tablature editor and player
+Description: |-
+    TuxGuitar is a multitrack tablature editor and player.
+    It can open Guitar Pro and PowerTab files.
+
+    With TuxGuitar, you will be able to compose music using
+    the following features:
+
+    * Tablature editor
+    * Score Viewer
+    * Autoscroll while playing
+    * Note duration management
+    * Various effects (bend, slide, vibrato, hammer-on/pull-off)
+    * Support for triplets (5,6,7,9,10,11,12)
+    * Repeat open, close and alternative endings
+    * Time signature management
+    * Tempo management
+
+    Note: this version of TuxGuitar is missing google
+    drive functionality as it depends on a proprietary
+    library.
+
+RepoType: git
+Repo: https://gitlab.com/f-droid-mirrors/empty.git
+
+Builds:
+  - versionName: fdroid_1821
+    versionCode: 1821
+    commit: d3746f98
+    init: svn checkout -r 1821 svn://svn.code.sf.net/p/tuxguitar/code/trunk/ .
+    patch:
+      - remove_gdrive.patch
+    output: build-scripts/tuxguitar-android/apk/build/outputs/apk/release/tuxguitar-android-fdroid_1821-release-unsigned.apk
+    prebuild:
+      - find . -iname "*.jar" -o -iname "*.zip" -o -iname "*.so" -exec rm {} \;
+      - rm -rf TuxGuitar-android-gdrive
+      - rm -rf TuxGuitar-android-gdrive-gdaa
+      - rm -rf TuxGuitar-android-gdrive-plugin
+      - sed -i "s/^\s*versionCode.*/        versionCode $$VERCODE$$/" build-scripts/tuxguitar-android/apk/build.gradle
+      - sed -i "s/SNAPSHOT/$$VERSION$$/g" build-scripts/tuxguitar-android/apk/build.gradle
+    scanignore:
+      - TuxGuitar-android/src/org/herac/tuxguitar/android/resource/TGResourceLoaderImpl.java
+    scandelete:
+      - .
+    build:
+      - cd build-scripts/tuxguitar-android
+      - gradle assembleRelease
+
+MaintainerNotes: |-
+    Using a dummy repo because svn-type repos are deprecated
+    And git-svn is incredibly slow.
+
+    Upstream doesn't have tags or any way to determine the release.
+
+    VersionCode is generated from build date, so we instead use our own.
+
+AutoUpdateMode: None
+UpdateCheckMode: None
+CurrentVersion: fdroid-1821
+CurrentVersionCode: 1821
diff --git a/metadata/org.herac.tuxguitar.android.application/remove_gdrive.patch b/metadata/org.herac.tuxguitar.android.application/remove_gdrive.patch
new file mode 100644
index 0000000000..0f2f836d75
--- /dev/null
+++ b/metadata/org.herac.tuxguitar.android.application/remove_gdrive.patch
@@ -0,0 +1,66 @@
+diff --git a/build-scripts/tuxguitar-android/apk/build.gradle b/build-scripts/tuxguitar-android/apk/build.gradle
+index a54a849..de95da8 100644
+--- a/build-scripts/tuxguitar-android/apk/build.gradle
++++ b/build-scripts/tuxguitar-android/apk/build.gradle
+@@ -4,7 +4,6 @@ def plugins = [
+ 	'TuxGuitar-android-gervill-plugin',
+ 	'TuxGuitar-android-midi-plugin',
+ 	'TuxGuitar-android-browser-saf-plugin',
+-	'TuxGuitar-android-gdrive-plugin',
+ 	'TuxGuitar-compat',
+ 	'TuxGuitar-gtp',
+ 	'TuxGuitar-gpx',
+@@ -74,7 +73,6 @@ dependencies {
+     implementation project(':tuxguitar-android-gervill')
+     implementation project(':tuxguitar-android-midi')
+     implementation project(':tuxguitar-android-browser-saf')
+-    implementation project(':tuxguitar-android-gdrive')
+     implementation project(':tuxguitar-android-gervill-soundbank')
+     
+     implementation 'com.itextpdf:itextpdf:5.5.10'
+diff --git a/build-scripts/tuxguitar-android/apk/src/main/AndroidManifest.xml b/build-scripts/tuxguitar-android/apk/src/main/AndroidManifest.xml
+index 5c88c42..a3fd8d8 100644
+--- a/build-scripts/tuxguitar-android/apk/src/main/AndroidManifest.xml
++++ b/build-scripts/tuxguitar-android/apk/src/main/AndroidManifest.xml
+@@ -13,11 +13,6 @@
+ 	<uses-permission android:name="android.permission.RECORD_AUDIO" />
+ 	<uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ 	
+-	<!-- Required by google drive -->
+-	<uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+-	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
+-	<uses-permission android:name="android.permission.USE_CREDENTIALS" />
+-	
+ 	<application
+ 		android:name="org.herac.tuxguitar.android.application.TGApplication"
+ 		android:allowBackup="true"
+@@ -79,9 +74,5 @@
+ 				<data android:mimeType="audio/midi" />
+ 			</intent-filter>
+ 		</activity>
+-		
+-		<meta-data
+-			android:name="com.google.android.gms.version"
+-			android:value="@integer/google_play_services_version" />
+ 	</application>
+-</manifest>
+\ No newline at end of file
++</manifest>
+diff --git a/build-scripts/tuxguitar-android/settings.gradle b/build-scripts/tuxguitar-android/settings.gradle
+index 81f5fe9..7a3d450 100644
+--- a/build-scripts/tuxguitar-android/settings.gradle
++++ b/build-scripts/tuxguitar-android/settings.gradle
+@@ -4,7 +4,6 @@ include ':apk',
+ 		':tuxguitar-android-resources',
+ 		':tuxguitar-android-midi',
+ 		':tuxguitar-android-browser-saf',
+-		':tuxguitar-android-gdrive',
+ 		':tuxguitar-android-gervill-soundbank'
+ 
+ project(':tuxguitar-android').projectDir = new File(settingsDir, '../../TuxGuitar-android')
+@@ -12,5 +11,4 @@ project(':tuxguitar-android-resources').projectDir = new File(settingsDir, '../.
+ project(':tuxguitar-android-gervill').projectDir = new File(settingsDir, '../../TuxGuitar-android-gervill')
+ project(':tuxguitar-android-midi').projectDir = new File(settingsDir, '../../TuxGuitar-android-midi')
+ project(':tuxguitar-android-browser-saf').projectDir = new File(settingsDir, '../../TuxGuitar-android-browser-saf')
+-project(':tuxguitar-android-gdrive').projectDir = new File(settingsDir, '../../TuxGuitar-android-gdrive')
+ project(':tuxguitar-android-gervill-soundbank').projectDir = new File(settingsDir, '../../TuxGuitar-android-gervill-soundbank')