diff --git a/.gitmodules b/.gitmodules
index 420af87f9..14ff62899 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,6 +18,3 @@
 [submodule "l10n"]
 	path = l10n
 	url = https://github.com/koreader/koreader-translations.git
-[submodule "metadata"]
-	path = metadata
-	url = https://github.com/koreader/koreader-metadata
diff --git a/metadata b/metadata
deleted file mode 160000
index 98fd6c8fe..000000000
--- a/metadata
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 98fd6c8fe0f3442a62346ee44454301007db3d8b
diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt
new file mode 100644
index 000000000..256baf69d
--- /dev/null
+++ b/metadata/en-US/full_description.txt
@@ -0,0 +1,15 @@
+## Main features
+
+* **portable**: runs on embedded devices (Cervantes, Kindle, Kobo, PocketBook), Android and Linux computers. Developers can run a KOReader emulator in Linux and MacOS.
+
+* **multi-format documents**: supports fixed page formats (PDF, DjVu, CBT, CBZ) and reflowable e-book formats (EPUB, FB2, Mobi, DOC, CHM, TXT). Scanned PDF/DjVu documents can also be reflowed with the built-in K2pdfopt library.
+
+* **full-featured reading**: multi-lingual user interface with a highly customizable reader view and many typesetting options. You can set arbitrary page margins, override line spacing and choose external fonts and styles. It has multi-lingual hyphenation dictionaries bundled into the application.
+
+* **integrated** with *calibre* (search metadata, receive ebooks wirelessly, browse library via OPDS),  *Evernote* (export hightlights), *Wallabag*, *Wikipedia*, *Google Translate* and other content providers.
+
+* **optimized for e-ink devices**: custom UI without animation, with paginated menus, adjustable text contrast, and easy zoom to fit content or page in paged media.
+
+* **extensible**: via plugins
+
+* **and much more**: look up words with StarDict dictionaries / Wikipedia, add your own online OPDS catalogs and RSS feeds, share ebooks with other KOReader devices wirelessly, online over-the-air software updates, an FTP client, an SSH server, …
diff --git a/metadata/en-US/images/icon.png b/metadata/en-US/images/icon.png
new file mode 100644
index 000000000..29d270b9f
Binary files /dev/null and b/metadata/en-US/images/icon.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/1.png b/metadata/en-US/images/phoneScreenshots/1.png
new file mode 100644
index 000000000..0901f845e
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/1.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/2.png b/metadata/en-US/images/phoneScreenshots/2.png
new file mode 100644
index 000000000..046b7f43c
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/2.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/3.png b/metadata/en-US/images/phoneScreenshots/3.png
new file mode 100644
index 000000000..db049e1ec
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/3.png differ
diff --git a/metadata/en-US/images/phoneScreenshots/4.png b/metadata/en-US/images/phoneScreenshots/4.png
new file mode 100644
index 000000000..bd77a1f50
Binary files /dev/null and b/metadata/en-US/images/phoneScreenshots/4.png differ
diff --git a/metadata/en-US/short_description.txt b/metadata/en-US/short_description.txt
new file mode 100644
index 000000000..535be5201
--- /dev/null
+++ b/metadata/en-US/short_description.txt
@@ -0,0 +1 @@
+Ebook reader with support for many formats like PDF, DjVu, EPUB, FB2, CBZ.
diff --git a/metadata/en-US/title.txt b/metadata/en-US/title.txt
new file mode 100644
index 000000000..de43c4672
--- /dev/null
+++ b/metadata/en-US/title.txt
@@ -0,0 +1 @@
+KOReader