diff --git a/src/en/mangasaki/build.gradle b/src/en/mangasaki/build.gradle
new file mode 100644
index 000000000..1e5f38003
--- /dev/null
+++ b/src/en/mangasaki/build.gradle
@@ -0,0 +1,8 @@
+ext {
+    extName = 'MangaSaki'
+    extClass = '.MangaSaki'
+    extVersionCode = 1
+    isNsfw = true
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/mangasaki/res/mipmap-hdpi/ic_launcher.png b/src/en/mangasaki/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..74db1be02
Binary files /dev/null and b/src/en/mangasaki/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/mangasaki/res/mipmap-mdpi/ic_launcher.png b/src/en/mangasaki/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..c134edf80
Binary files /dev/null and b/src/en/mangasaki/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/mangasaki/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangasaki/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..e8567e7b1
Binary files /dev/null and b/src/en/mangasaki/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/mangasaki/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangasaki/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..c16147bf7
Binary files /dev/null and b/src/en/mangasaki/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/mangasaki/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangasaki/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..bdafb0050
Binary files /dev/null and b/src/en/mangasaki/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/mangasaki/src/eu/kanade/tachiyomi/extension/en/mangasaki/MangaSaki.kt b/src/en/mangasaki/src/eu/kanade/tachiyomi/extension/en/mangasaki/MangaSaki.kt
new file mode 100644
index 000000000..a7b40629e
--- /dev/null
+++ b/src/en/mangasaki/src/eu/kanade/tachiyomi/extension/en/mangasaki/MangaSaki.kt
@@ -0,0 +1,265 @@
+package eu.kanade.tachiyomi.extension.en.mangasaki
+
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.model.Filter
+import eu.kanade.tachiyomi.source.model.FilterList
+import eu.kanade.tachiyomi.source.model.Page
+import eu.kanade.tachiyomi.source.model.SChapter
+import eu.kanade.tachiyomi.source.model.SManga
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import eu.kanade.tachiyomi.util.asJsoup
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+import okhttp3.Request
+import okhttp3.Response
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import uy.kohesive.injekt.injectLazy
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+class MangaSaki : ParsedHttpSource() {
+
+    override val name = "MangaSaki"
+
+    override val baseUrl = "https://www.mangasaki.org"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    // popular
+    override fun popularMangaRequest(page: Int): Request {
+        return GET("$baseUrl/directory/hot?page=${page - 1}", headers)
+    }
+
+    override fun popularMangaSelector() = ".directory_list tbody tr"
+
+    override fun popularMangaFromElement(element: Element): SManga {
+        val manga = SManga.create()
+        val titleElement = element.selectFirst("td a img")!!
+        manga.title = titleElement.attr("title")
+        manga.setUrlWithoutDomain(element.selectFirst("td a")!!.attr("href"))
+        manga.thumbnail_url = titleElement.attr("src")
+
+        return manga
+    }
+
+    override fun popularMangaNextPageSelector() = "li.pager-next a"
+
+    // latest
+    override fun latestUpdatesRequest(page: Int): Request {
+        return GET("$baseUrl/directory/new?page=${page - 1}", headers)
+    }
+
+    override fun latestUpdatesSelector() = popularMangaSelector()
+
+    override fun latestUpdatesFromElement(element: Element): SManga = popularMangaFromElement(element)
+
+    override fun latestUpdatesNextPageSelector() = popularMangaNextPageSelector()
+
+    // search
+    private var searchMode: Boolean = false
+
+    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        return if (query.isNotEmpty()) {
+            searchMode = true
+            GET("$baseUrl/search/node/$query?page=${page - 1}", headers)
+        } else {
+            searchMode = false
+            var url = "$baseUrl/tags/"
+            filters.forEach { filter ->
+                when (filter) {
+                    is GenreFilter -> {
+                        url += "${filter.toUriPart()}?page=${page - 1}"
+                    }
+                    else -> {}
+                }
+            }
+            GET(url, headers)
+        }
+    }
+
+    override fun searchMangaSelector(): String {
+        return if (!searchMode) {
+            "div.view-content div.views-row"
+        } else {
+            "ol.search-results li.search-result"
+        }
+    }
+
+    override fun searchMangaFromElement(element: Element): SManga {
+        val manga = SManga.create()
+        if (!searchMode) {
+            manga.title = element.select("div.views-field-title a").text()
+            manga.setUrlWithoutDomain(element.select("div.views-field-title a").attr("href"))
+            manga.thumbnail_url = element.select("div.views-field-field-image2 img").attr("src")
+        } else {
+            // The site doesn't show thumbnails when using search
+            val titleElement = element.select("h3.title a")
+            manga.title = titleElement.text()
+            manga.setUrlWithoutDomain(titleElement.attr("href"))
+        }
+
+        return manga
+    }
+
+    override fun searchMangaNextPageSelector() = popularMangaNextPageSelector()
+
+    // manga details
+    override fun mangaDetailsParse(document: Document): SManga {
+        val manga = SManga.create()
+        manga.author = document.selectFirst("div.field-name-field-author div.field-item")?.text()
+        manga.genre = document.select("div.field-name-field-genres ul li a").joinToString { it.text() }
+        manga.description = document.select("div.field-name-body div.field-item p").text()
+        manga.thumbnail_url = document.select("div.field-name-field-image2 div.field-item img").attr("src")
+
+        val statusText = document.select("div.field-name-field-status div.field-item").text()
+        manga.status = when {
+            statusText.contains("Ongoing", true) -> SManga.ONGOING
+            statusText.contains("Complete", true) -> SManga.COMPLETED
+            else -> SManga.UNKNOWN
+        }
+
+        return manga
+    }
+
+    // chapters
+    override fun chapterListRequest(manga: SManga) = chapterListRequest(manga.url, 1)
+
+    private fun chapterListRequest(url: String, page: Int): Request {
+        return GET("$baseUrl$url?page=${page - 1}", headers)
+    }
+
+    override fun chapterListParse(response: Response): List<SChapter> {
+        var document = response.asJsoup()
+        val chapters = document.select(chapterListSelector()).map(::chapterFromElement).toMutableList()
+        var nextPage = 2
+
+        while (document.select(latestUpdatesNextPageSelector()).isNotEmpty()) {
+            val dirtyPage = document.select("div#block-search-form form#search-block-form").attr("action")
+            val cleaningIndex = dirtyPage.lastIndexOf("?")
+            val cleanPage = dirtyPage.substring(0, cleaningIndex)
+            document = client.newCall(chapterListRequest(cleanPage, nextPage)).execute().asJsoup()
+            chapters.addAll(document.select(chapterListSelector()).map(::chapterFromElement))
+            nextPage++
+        }
+
+        return chapters
+    }
+
+    override fun chapterListSelector() = ".chlist tbody tr"
+
+    private val dateFormat = SimpleDateFormat("dd MMM yyyy", Locale.ENGLISH)
+
+    override fun chapterFromElement(element: Element): SChapter {
+        val chapter = SChapter.create()
+        chapter.setUrlWithoutDomain(element.select("a").attr("href"))
+        chapter.name = element.select("a").text()
+        chapter.date_upload = try {
+            element.select("td").last()?.text()?.let {
+                dateFormat.parse(it)?.time ?: 0L
+            } ?: 0L
+        } catch (_: ParseException) {
+            0L
+        }
+
+        return chapter
+    }
+
+    // pages
+    override fun pageListParse(document: Document): List<Page> {
+        val jsonString = document.select("script:containsData(showmanga)").first()!!.data()
+            .substringAfter("(Drupal.settings, ")
+            .substringBeforeLast(");")
+
+        return parseJSON(jsonString).mapIndexed { i, it ->
+            Page(i, imageUrl = it)
+        }
+    }
+
+    override fun imageUrlParse(document: Document): String = throw UnsupportedOperationException()
+
+    override fun getFilterList() = FilterList(
+        Filter.Header("NOTE: Ignored if using text search!"),
+        Filter.Separator(),
+        GenreFilter(),
+    )
+
+    private class GenreFilter : UriPartFilter(
+        "Category",
+        arrayOf(
+            Pair("Action", "action"),
+            Pair("Adult", "adult"),
+            Pair("Adventure", "adventure"),
+            Pair("Comedy", "comedy"),
+            Pair("Crime", "crime"),
+            Pair("Drama", "drama"),
+            Pair("Dungeons", "dungeons"),
+            Pair("Ecchi", "ecchi"),
+            Pair("Fantasy", "fantasy"),
+            Pair("GenderBender", "genderbender"),
+            Pair("Gender Bender", "gender-bender"),
+            Pair("Harem", "harem"),
+            Pair("Hentai", "hentai"),
+            Pair("Historical", "historical"),
+            Pair("Horror", "horror"),
+            Pair("Isekai", "isekai"),
+            Pair("Josei", "josei"),
+            Pair("Lolicon", "lolicon"),
+            Pair("Magical Girls", "magical-girls"),
+            Pair("MartialArts", "martialarts"),
+            Pair("Martial Arts", "martial-arts"),
+            Pair("Mature", "mature"),
+            Pair("Mecha", "mecha"),
+            Pair("Medical", "medical"),
+            Pair("N/A", "na"),
+            Pair("Philosophical", "philosophical"),
+            Pair("Psychological", "psychological"),
+            Pair("SchoolLife", "schoollife"),
+            Pair("School Life", "school-life"),
+            Pair("Sci-fi", "sci-fi"),
+            Pair("Sci-fi Shounen", "sci-fi-shounen"),
+            Pair("Seinen", "seinen"),
+            Pair("Shotacon", "shotacon"),
+            Pair("Shoujo", "shoujo"),
+            Pair("ShoujoAi", "shoujoai"),
+            Pair("Shoujo Ai", "shoujo-ai"),
+            Pair("Shounen", "shounen"),
+            Pair("ShounenAi", "shounenai"),
+            Pair("Shounen-Ai", "shounen-ai"),
+            Pair("SliceofLife", "slicelife"),
+            Pair("Slice of Life", "slice-life"),
+            Pair("Smut", "smut"),
+            Pair("Sports", "sports"),
+            Pair("Superhero", "superhero"),
+            Pair("Supernatural", "supernatural"),
+            Pair("System", "system"),
+            Pair("Thriller", "thriller"),
+            Pair("Tragedy", "tragedy"),
+            Pair("Webtoons", "webtoons"),
+            Pair("Wuxia", "wuxia"),
+            Pair("Yuri", "yuri"),
+        ),
+    )
+
+    private val json: Json by injectLazy()
+
+    private fun parseJSON(jsonString: String): List<String> {
+        val jsonData = json.decodeFromString<JSONData>(jsonString)
+        return jsonData.showmanga.paths.filter { it.contains("mangasaki") }
+    }
+
+    private open class UriPartFilter(displayName: String, private val vals: Array<Pair<String, String>>) :
+        Filter.Select<String>(displayName, vals.map { it.first }.toTypedArray()) {
+        fun toUriPart() = vals[state].second
+    }
+
+    @Serializable
+    class JSONData(val showmanga: ShowMangaData)
+
+    @Serializable
+    class ShowMangaData(val paths: List<String>)
+}