diff --git a/src/de/mangatube/build.gradle b/src/de/mangatube/build.gradle
new file mode 100644
index 000000000..648cb7c41
--- /dev/null
+++ b/src/de/mangatube/build.gradle
@@ -0,0 +1,17 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    appName = 'Tachiyomi: Manga Tube'
+    pkgNameSuffix = 'de.mangatube'
+    extClass = '.MangaTube'
+    extVersionCode = 1
+    libVersion = '1.2'
+}
+
+dependencies {
+    compileOnly 'com.google.code.gson:gson:2.8.2'
+    compileOnly 'com.github.salomonbrys.kotson:kotson:2.5.0'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/de/mangatube/res/mipmap-hdpi/ic_launcher.png b/src/de/mangatube/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..e391b1687
Binary files /dev/null and b/src/de/mangatube/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/de/mangatube/res/mipmap-mdpi/ic_launcher.png b/src/de/mangatube/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..cbb42e4cd
Binary files /dev/null and b/src/de/mangatube/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/de/mangatube/res/mipmap-xhdpi/ic_launcher.png b/src/de/mangatube/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..209d0c612
Binary files /dev/null and b/src/de/mangatube/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/de/mangatube/res/mipmap-xxhdpi/ic_launcher.png b/src/de/mangatube/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..dc38d2e52
Binary files /dev/null and b/src/de/mangatube/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/de/mangatube/res/mipmap-xxxhdpi/ic_launcher.png b/src/de/mangatube/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..61523b112
Binary files /dev/null and b/src/de/mangatube/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/de/mangatube/res/web_hi_res_512.png b/src/de/mangatube/res/web_hi_res_512.png
new file mode 100644
index 000000000..09a3f91d7
Binary files /dev/null and b/src/de/mangatube/res/web_hi_res_512.png differ
diff --git a/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt b/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt
new file mode 100644
index 000000000..db603baaf
--- /dev/null
+++ b/src/de/mangatube/src/eu/kanade/tachiyomi/extension/de/mangatube/MangaTube.kt
@@ -0,0 +1,175 @@
+package eu.kanade.tachiyomi.extension.de.mangatube
+
+import com.github.salomonbrys.kotson.fromJson
+import com.github.salomonbrys.kotson.get
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.network.POST
+import eu.kanade.tachiyomi.network.asObservableSuccess
+import eu.kanade.tachiyomi.source.model.*
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import okhttp3.*
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.lang.Exception
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Locale
+import rx.Observable
+import java.util.concurrent.TimeUnit
+
+class MangaTube : ParsedHttpSource() {
+
+    override val name = "Manga Tube"
+
+    override val baseUrl = "https://manga-tube.me"
+
+    override val lang = "de"
+
+    override val supportsLatest = true
+
+    override val client: OkHttpClient = network.cloudflareClient.newBuilder()
+        .connectTimeout(1, TimeUnit.MINUTES)
+        .readTimeout(1, TimeUnit.MINUTES)
+        .writeTimeout(1, TimeUnit.MINUTES)
+        .build()
+
+    private val xhrHeaders: Headers = headersBuilder().add("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8").build()
+
+    private val gson by lazy { Gson() }
+
+    // Popular
+
+    override fun fetchPopularManga(page: Int): Observable<MangasPage> {
+        return client.newCall(popularMangaRequest(page))
+            .asObservableSuccess()
+            .map { response ->
+                parseMangaFromJson(response, page < 96)
+            }
+    }
+
+    override fun popularMangaRequest(page: Int): Request {
+        val rbodyContent = "action=load_series_list_entries&parameter%5Bpage%5D=$page&parameter%5Bletter%5D=&parameter%5Bsortby%5D=popularity&parameter%5Border%5D=asc"
+        return POST("$baseUrl/ajax", xhrHeaders, RequestBody.create(null, rbodyContent))
+    }
+
+    // popular uses "success" as a key, search uses "suggestions"
+    // for future reference: if adding filters, advanced search might use a different key
+    private fun parseMangaFromJson(response: Response, hasNextPage: Boolean): MangasPage {
+        var titleKey = "manga_title"
+        val mangas = gson.fromJson<JsonObject>(response.body()!!.string())
+            .let { it["success"] ?: it["suggestions"].also { titleKey = "value" } }
+            .asJsonArray
+            .map { json ->
+                SManga.create().apply {
+                    title = json[titleKey].asString
+                    url = "/series/${json["manga_slug"].asString}"
+                    thumbnail_url = json["covers"][0]["img_name"].asString
+                }
+            }
+        return MangasPage(mangas, hasNextPage)
+    }
+
+    override fun popularMangaSelector() = throw UnsupportedOperationException("Not used")
+
+    override fun popularMangaFromElement(element: Element): SManga = throw UnsupportedOperationException("Not used")
+
+    override fun popularMangaNextPageSelector() = throw UnsupportedOperationException("Not used")
+
+    // Latest
+
+    override fun latestUpdatesRequest(page: Int): Request {
+        return GET("$baseUrl/?page=$page", headers)
+    }
+
+    override fun latestUpdatesSelector() = "div#series-updates div.series-update:not([style\$=none])"
+
+    override fun latestUpdatesFromElement(element: Element): SManga {
+        return SManga.create().apply {
+            element.select("a.series-name").let {
+                title = it.text()
+                setUrlWithoutDomain(it.attr("href"))
+            }
+            thumbnail_url = element.select("div.cover img").attr("abs:data-original")
+        }
+    }
+
+    override fun latestUpdatesNextPageSelector() = "button#load-more-updates"
+
+    // Search
+
+    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        val rbodyContent = "action=search_query&parameter%5Bquery%5D=$query"
+        return POST("$baseUrl/ajax", xhrHeaders, RequestBody.create(null, rbodyContent))
+    }
+
+    override fun searchMangaParse(response: Response): MangasPage {
+        return parseMangaFromJson(response, false)
+    }
+
+    override fun searchMangaSelector() = throw UnsupportedOperationException("Not used")
+
+    override fun searchMangaFromElement(element: Element): SManga = throw UnsupportedOperationException("Not used")
+
+    override fun searchMangaNextPageSelector() = throw UnsupportedOperationException("Not used")
+
+    // Details
+
+    override fun mangaDetailsParse(document: Document): SManga {
+        return SManga.create().apply {
+            document.select("div.series-detailed div.row").first().let { info ->
+                author = info.select("li:contains(Autor:) a").joinToString { it.text() }
+                artist = info.select("li:contains(Artist:) a").joinToString { it.text() }
+                status = info.select("li:contains(Offiziel)").firstOrNull()?.ownText().toStatus()
+                genre = info.select(".genre-list a").joinToString { it.text() }
+                thumbnail_url = info.select("img").attr("abs:data-original")
+            }
+            description = document.select("div.series-footer h4 ~ p").joinToString("\n\n") { it.text() }
+        }
+    }
+
+    private fun String?.toStatus() = when {
+        this == null -> SManga.UNKNOWN
+        this.contains("laufend", ignoreCase = true) -> SManga.ONGOING
+        this.contains("abgeschlossen", ignoreCase = true) -> SManga.COMPLETED
+        else -> SManga.UNKNOWN
+    }
+
+    // Chapters
+
+    override fun chapterListSelector() = "ul.chapter-list li"
+
+    override fun chapterFromElement(element: Element): SChapter {
+        return SChapter.create().apply {
+            element.select("a[title]").let {
+                name = "${it.select("b").text()} ${it.select("span:not(.btn)").joinToString(" ") { span -> span.text() }}"
+                setUrlWithoutDomain(it.attr("href"))
+            }
+            date_upload = element.select("p.chapter-date").text().let {
+                try {
+                    SimpleDateFormat("dd.MM.yyyy", Locale.getDefault()).parse(it.substringAfter(" ")).time
+                } catch (_: ParseException) {
+                    0L
+                }
+            }
+        }
+    }
+
+    // Pages
+
+    override fun pageListParse(document: Document): List<Page> {
+        val script = document.select("script:containsData(current_chapter:)").first().data()
+        val imagePath = Regex("""img_path: '(.*)'""").find(script)?.groupValues?.get(1)
+            ?: throw Exception("Couldn't find image path")
+        val jsonArray = Regex("""pages: (\[.*]),""").find(script)?.groupValues?.get(1)
+            ?: throw Exception("Couldn't find JSON array")
+
+        return gson.fromJson<JsonArray>(jsonArray).mapIndexed { i, json ->
+            Page(i, "", imagePath + json.asJsonObject["file_name"].asString)
+        }
+    }
+
+    override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException("Not used")
+}