diff --git a/metadata/org.coolreader.fdroid.yml b/metadata/org.coolreader.fdroid.yml
new file mode 100644
index 0000000000..e6fa8cea1f
--- /dev/null
+++ b/metadata/org.coolreader.fdroid.yml
@@ -0,0 +1,44 @@
+Categories:
+  - Reading
+License: GPL-2.0-only
+AuthorName: Vadim Lopatin
+AuthorEmail: coolreader.org@gmail.com
+SourceCode: https://github.com/buggins/coolreader
+IssueTracker: https://github.com/buggins/coolreader/issues
+Donate: https://sourceforge.net/p/crengine/donate
+
+AutoName: Cool Reader
+Description: |-
+    An e-book reader. Supported formats: FB2, TXT, RTF, TCR, HTML, EPUB, CHM. Browse
+    free books online and add your own OPDS shares.
+
+    The default dictionary app is non-free. However, you can choose
+    https://f-droid.org/packages/aarddict.android as a dictionary from the Dictionary section of the
+    Settings.
+
+RepoType: git
+Repo: https://github.com/buggins/coolreader
+
+Builds:
+  - versionName: 3.2.58-1-fdroid
+    versionCode: 32580
+    commit: cr3.2.58
+    subdir: android/app
+    gradle:
+      - fdroid
+    rm:
+      - cr3gui
+      - cr3qt
+      - cr3wx
+    prebuild:
+      - sed -i -e 's/enable true/enable false/' build.gradle
+      - cd ../..
+      - ./thirdparty-deploy.sh
+    scandelete:
+      - thirdparty
+    ndk: r21e
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+CurrentVersion: 3.2.58-1-fdroid
+CurrentVersionCode: 32580
diff --git a/metadata/org.coolreader.fdroid/bn/summary.txt b/metadata/org.coolreader.fdroid/bn/summary.txt
new file mode 100644
index 0000000000..187f3476c5
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/bn/summary.txt
@@ -0,0 +1 @@
+ই-বই পাঠক
diff --git a/metadata/org.coolreader.fdroid/de/summary.txt b/metadata/org.coolreader.fdroid/de/summary.txt
new file mode 100644
index 0000000000..23d8ead1d2
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/de/summary.txt
@@ -0,0 +1 @@
+E-Book-Lesegerät
diff --git a/metadata/org.coolreader.fdroid/en-US/summary.txt b/metadata/org.coolreader.fdroid/en-US/summary.txt
new file mode 100644
index 0000000000..b8662304e7
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/en-US/summary.txt
@@ -0,0 +1 @@
+E-book reader
diff --git a/metadata/org.coolreader.fdroid/es/summary.txt b/metadata/org.coolreader.fdroid/es/summary.txt
new file mode 100644
index 0000000000..a174854c1f
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/es/summary.txt
@@ -0,0 +1 @@
+Lector de libros electrónicos
diff --git a/metadata/org.coolreader.fdroid/fr/summary.txt b/metadata/org.coolreader.fdroid/fr/summary.txt
new file mode 100644
index 0000000000..038d0117e6
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/fr/summary.txt
@@ -0,0 +1 @@
+Lecteur de livres électroniques
diff --git a/metadata/org.coolreader.fdroid/he/summary.txt b/metadata/org.coolreader.fdroid/he/summary.txt
new file mode 100644
index 0000000000..8c9052fab3
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/he/summary.txt
@@ -0,0 +1 @@
+קורא ספרים אלקטרוניים
diff --git a/metadata/org.coolreader.fdroid/kab/summary.txt b/metadata/org.coolreader.fdroid/kab/summary.txt
new file mode 100644
index 0000000000..5061c2cfa4
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/kab/summary.txt
@@ -0,0 +1 @@
+imeɣri n e-book
diff --git a/metadata/org.coolreader.fdroid/nb/summary.txt b/metadata/org.coolreader.fdroid/nb/summary.txt
new file mode 100644
index 0000000000..a38771fc19
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/nb/summary.txt
@@ -0,0 +1 @@
+E-bokleser
diff --git a/metadata/org.coolreader.fdroid/pl/summary.txt b/metadata/org.coolreader.fdroid/pl/summary.txt
new file mode 100644
index 0000000000..add07cd232
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/pl/summary.txt
@@ -0,0 +1 @@
+Czytnik E-booków
diff --git a/metadata/org.coolreader.fdroid/pt-BR/summary.txt b/metadata/org.coolreader.fdroid/pt-BR/summary.txt
new file mode 100644
index 0000000000..ad862da329
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/pt-BR/summary.txt
@@ -0,0 +1 @@
+Leia sobre o app aqui: https://f-droid.org/packages/org.coolreader
diff --git a/metadata/org.coolreader.fdroid/pt-PT/summary.txt b/metadata/org.coolreader.fdroid/pt-PT/summary.txt
new file mode 100644
index 0000000000..37beeab55b
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/pt-PT/summary.txt
@@ -0,0 +1 @@
+Leitor de e-book
diff --git a/metadata/org.coolreader.fdroid/pt/summary.txt b/metadata/org.coolreader.fdroid/pt/summary.txt
new file mode 100644
index 0000000000..37beeab55b
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/pt/summary.txt
@@ -0,0 +1 @@
+Leitor de e-book
diff --git a/metadata/org.coolreader.fdroid/ro/summary.txt b/metadata/org.coolreader.fdroid/ro/summary.txt
new file mode 100644
index 0000000000..90f141d4a2
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/ro/summary.txt
@@ -0,0 +1 @@
+Cititor de cărți electronice
diff --git a/metadata/org.coolreader.fdroid/ru/summary.txt b/metadata/org.coolreader.fdroid/ru/summary.txt
new file mode 100644
index 0000000000..016a399679
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/ru/summary.txt
@@ -0,0 +1 @@
+Читалка электронных книг
diff --git a/metadata/org.coolreader.fdroid/sq/summary.txt b/metadata/org.coolreader.fdroid/sq/summary.txt
new file mode 100644
index 0000000000..c5e95407bc
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/sq/summary.txt
@@ -0,0 +1 @@
+Lexues e-librash
diff --git a/metadata/org.coolreader.fdroid/tr/summary.txt b/metadata/org.coolreader.fdroid/tr/summary.txt
new file mode 100644
index 0000000000..40003c8661
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/tr/summary.txt
@@ -0,0 +1 @@
+E-kitap okuyucu
diff --git a/metadata/org.coolreader.fdroid/uk/summary.txt b/metadata/org.coolreader.fdroid/uk/summary.txt
new file mode 100644
index 0000000000..d77ce0fa6c
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/uk/summary.txt
@@ -0,0 +1 @@
+Читання електронних книг
diff --git a/metadata/org.coolreader.fdroid/zh-CN/summary.txt b/metadata/org.coolreader.fdroid/zh-CN/summary.txt
new file mode 100644
index 0000000000..ef5cff7ffe
--- /dev/null
+++ b/metadata/org.coolreader.fdroid/zh-CN/summary.txt
@@ -0,0 +1 @@
+电子书阅读器
diff --git a/metadata/org.coolreader.yml b/metadata/org.coolreader.yml
index f183cb8bbd..c862455311 100644
--- a/metadata/org.coolreader.yml
+++ b/metadata/org.coolreader.yml
@@ -10,6 +10,8 @@ Donate: https://sourceforge.net/p/crengine/donate
 
 AutoName: Cool Reader
 Description: |-
+    <b>Note:</b> The app id is changed. Please use https://f-droid.org/packages/org.coolreader.fdroid/ instead.
+
     An e-book reader. Supported formats: FB2, TXT, RTF, TCR, HTML, EPUB, CHM. Browse
     free books online and add your own OPDS shares.
 
@@ -599,6 +601,6 @@ Builds:
     ndk: r21
 
 AutoUpdateMode: None
-UpdateCheckMode: Tags
-CurrentVersion: 3.2.58-1
-CurrentVersionCode: 32580
+UpdateCheckMode: None
+CurrentVersion: 3.2.38-1
+CurrentVersionCode: 32380