diff --git a/src/en/mangafox/build.gradle b/src/en/mangafox/build.gradle
new file mode 100644
index 000000000..acfd095ee
--- /dev/null
+++ b/src/en/mangafox/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+ext {
+    appName = 'Tachiyomi: Mangafox'
+    pkgNameSuffix = 'en.mangafox'
+    extClass = '.Mangafox'
+    extVersionCode = 3
+    libVersion = '1.2'
+}
+
+apply from: "$rootDir/common.gradle"
diff --git a/src/en/mangafox/res/mipmap-hdpi/ic_launcher.png b/src/en/mangafox/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 000000000..f2b26e65b
Binary files /dev/null and b/src/en/mangafox/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/src/en/mangafox/res/mipmap-mdpi/ic_launcher.png b/src/en/mangafox/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 000000000..ec97ff9ff
Binary files /dev/null and b/src/en/mangafox/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/src/en/mangafox/res/mipmap-xhdpi/ic_launcher.png b/src/en/mangafox/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..629ac98da
Binary files /dev/null and b/src/en/mangafox/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src/en/mangafox/res/mipmap-xxhdpi/ic_launcher.png b/src/en/mangafox/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 000000000..73b1eb472
Binary files /dev/null and b/src/en/mangafox/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src/en/mangafox/res/mipmap-xxxhdpi/ic_launcher.png b/src/en/mangafox/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 000000000..5ea69c7ba
Binary files /dev/null and b/src/en/mangafox/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src/en/mangafox/res/web_hi_res_512.png b/src/en/mangafox/res/web_hi_res_512.png
new file mode 100644
index 000000000..ee61fab76
Binary files /dev/null and b/src/en/mangafox/res/web_hi_res_512.png differ
diff --git a/src/en/mangafox/src/eu/kanade/tachiyomi/extension/en/mangafox/Mangafox.kt b/src/en/mangafox/src/eu/kanade/tachiyomi/extension/en/mangafox/Mangafox.kt
new file mode 100644
index 000000000..ee69054a5
--- /dev/null
+++ b/src/en/mangafox/src/eu/kanade/tachiyomi/extension/en/mangafox/Mangafox.kt
@@ -0,0 +1,230 @@
+package eu.kanade.tachiyomi.extension.en.mangafox
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.source.model.*
+import eu.kanade.tachiyomi.source.online.ParsedHttpSource
+import okhttp3.HttpUrl
+import okhttp3.Request
+import org.jsoup.nodes.Document
+import org.jsoup.nodes.Element
+import java.text.ParseException
+import java.text.SimpleDateFormat
+import java.util.*
+
+class Mangafox : ParsedHttpSource() {
+
+    override val id: Long = 3
+
+    override val name = "Mangafox"
+
+    override val baseUrl = "http://fanfox.net"
+
+    override val lang = "en"
+
+    override val supportsLatest = true
+
+    override fun popularMangaSelector() = "div#mangalist > ul.list > li"
+
+    override fun popularMangaRequest(page: Int): Request {
+        val pageStr = if (page != 1) "$page.htm" else ""
+        return GET("$baseUrl/directory/$pageStr", headers)
+    }
+
+    override fun latestUpdatesSelector() = "div#mangalist > ul.list > li"
+
+    override fun latestUpdatesRequest(page: Int): Request {
+        val pageStr = if (page != 1) "$page.htm" else ""
+        return GET("$baseUrl/directory/$pageStr?latest")
+    }
+
+    override fun popularMangaFromElement(element: Element): SManga {
+        val manga = SManga.create()
+        element.select("a.title").first().let {
+            manga.setUrlWithoutDomain(it.attr("href"))
+            manga.title = it.text()
+        }
+        return manga
+    }
+
+    override fun latestUpdatesFromElement(element: Element): SManga {
+        return popularMangaFromElement(element)
+    }
+
+    override fun popularMangaNextPageSelector() = "a:has(span.next)"
+
+    override fun latestUpdatesNextPageSelector() = "a:has(span.next)"
+
+    override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
+        val url = HttpUrl.parse("$baseUrl/search.php?name_method=cw&author_method=cw&artist_method=cw&advopts=1")!!.newBuilder().addQueryParameter("name", query)
+        (if (filters.isEmpty()) getFilterList() else filters).forEach { filter ->
+            when (filter) {
+                is Status -> url.addQueryParameter(filter.id, filter.state.toString())
+                is GenreList -> filter.state.forEach { genre -> url.addQueryParameter(genre.id, genre.state.toString()) }
+                is TextField -> url.addQueryParameter(filter.key, filter.state)
+                is Type -> url.addQueryParameter("type", if (filter.state == 0) "" else filter.state.toString())
+                is OrderBy -> {
+                    url.addQueryParameter("sort", arrayOf("name", "rating", "views", "total_chapters", "last_chapter_time")[filter.state!!.index])
+                    url.addQueryParameter("order", if (filter.state?.ascending == true) "az" else "za")
+                }
+            }
+        }
+        url.addQueryParameter("page", page.toString())
+        return GET(url.toString(), headers)
+    }
+
+    override fun searchMangaSelector() = "div#mangalist > ul.list > li"
+
+    override fun searchMangaFromElement(element: Element): SManga {
+        val manga = SManga.create()
+        element.select("a.title").first().let {
+            manga.setUrlWithoutDomain(it.attr("href"))
+            manga.title = it.text()
+        }
+        return manga
+    }
+
+    override fun searchMangaNextPageSelector() = "a:has(span.next)"
+
+    override fun mangaDetailsParse(document: Document): SManga {
+        val infoElement = document.select("div#title").first()
+        val rowElement = infoElement.select("table > tbody > tr:eq(1)").first()
+        val sideInfoElement = document.select("#series_info").first()
+        val licensedElement = document.select("div.warning").first()
+
+        val manga = SManga.create()
+        manga.author = rowElement.select("td:eq(1)").first()?.text()
+        manga.artist = rowElement.select("td:eq(2)").first()?.text()
+        manga.genre = rowElement.select("td:eq(3)").first()?.text()
+        manga.description = infoElement.select("p.summary").first()?.text()
+        val isLicensed = licensedElement?.text()?.contains("licensed")
+        if (isLicensed == true) {
+            manga.status = SManga.LICENSED
+        } else {
+            manga.status = sideInfoElement.select(".data").first()?.text().orEmpty().let { parseStatus(it) }
+        }
+
+        manga.thumbnail_url = sideInfoElement.select("div.cover > img").first()?.attr("src")
+        return manga
+    }
+
+    private fun parseStatus(status: String) = when {
+        status.contains("Ongoing") -> SManga.ONGOING
+        status.contains("Completed") -> SManga.COMPLETED
+        else -> SManga.UNKNOWN
+    }
+
+    override fun chapterListSelector() = "div#chapters li div"
+
+    override fun chapterFromElement(element: Element): SChapter {
+        val urlElement = element.select("a.tips").first()
+
+        val chapter = SChapter.create()
+        chapter.setUrlWithoutDomain(urlElement.attr("href"))
+        chapter.name = element.select("span.title.nowrap").first()?.text()?.let { urlElement.text() + " - " + it } ?: urlElement.text()
+        chapter.date_upload = element.select("span.date").first()?.text()?.let { parseChapterDate(it) } ?: 0
+        return chapter
+    }
+
+    private fun parseChapterDate(date: String): Long {
+        return if ("Today" in date || " ago" in date) {
+            Calendar.getInstance().apply {
+                set(Calendar.HOUR_OF_DAY, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }.timeInMillis
+        } else if ("Yesterday" in date) {
+            Calendar.getInstance().apply {
+                add(Calendar.DATE, -1)
+                set(Calendar.HOUR_OF_DAY, 0)
+                set(Calendar.MINUTE, 0)
+                set(Calendar.SECOND, 0)
+                set(Calendar.MILLISECOND, 0)
+            }.timeInMillis
+        } else {
+            try {
+                SimpleDateFormat("MMM d, yyyy", Locale.ENGLISH).parse(date).time
+            } catch (e: ParseException) {
+                0L
+            }
+        }
+    }
+
+    override fun pageListParse(document: Document): List<Page> {
+        val url = document.baseUri().substringBeforeLast('/')
+
+        val pages = mutableListOf<Page>()
+        document.select("select.m").first()?.select("option:not([value=0])")?.forEach {
+            pages.add(Page(pages.size, "$url/${it.attr("value")}.html"))
+        }
+        return pages
+    }
+
+    override fun imageUrlParse(document: Document): String {
+        val url = document.getElementById("image").attr("src")
+        return if ("compressed?token=" !in url) {
+            url
+        } else {
+            "http://mangafox.me/media/logo.png"
+        }
+    }
+
+    private class Status(val id: String = "is_completed") : Filter.TriState("Completed")
+    private class Genre(name: String, val id: String = "genres[$name]") : Filter.TriState(name)
+    private class TextField(name: String, val key: String) : Filter.Text(name)
+    private class Type : Filter.Select<String>("Type", arrayOf("Any", "Japanese Manga", "Korean Manhwa", "Chinese Manhua"))
+    private class OrderBy : Filter.Sort("Order by",
+            arrayOf("Series name", "Rating", "Views", "Total chapters", "Last chapter"),
+            Filter.Sort.Selection(2, false))
+
+    private class GenreList(genres: List<Genre>) : Filter.Group<Genre>("Genres", genres)
+
+    override fun getFilterList() = FilterList(
+            TextField("Author", "author"),
+            TextField("Artist", "artist"),
+            Type(),
+            Status(),
+            OrderBy(),
+            GenreList(getGenreList())
+    )
+
+    // $('select.genres').map((i,el)=>`Genre("${$(el).next().text().trim()}", "${$(el).attr('name')}")`).get().join(',\n')
+    // on http://mangafox.me/search.php
+    private fun getGenreList() = listOf(
+            Genre("Action"),
+            Genre("Adult"),
+            Genre("Adventure"),
+            Genre("Comedy"),
+            Genre("Doujinshi"),
+            Genre("Drama"),
+            Genre("Ecchi"),
+            Genre("Fantasy"),
+            Genre("Gender Bender"),
+            Genre("Harem"),
+            Genre("Historical"),
+            Genre("Horror"),
+            Genre("Josei"),
+            Genre("Martial Arts"),
+            Genre("Mature"),
+            Genre("Mecha"),
+            Genre("Mystery"),
+            Genre("One Shot"),
+            Genre("Psychological"),
+            Genre("Romance"),
+            Genre("School Life"),
+            Genre("Sci-fi"),
+            Genre("Seinen"),
+            Genre("Shoujo"),
+            Genre("Shoujo Ai"),
+            Genre("Shounen"),
+            Genre("Shounen Ai"),
+            Genre("Slice of Life"),
+            Genre("Smut"),
+            Genre("Sports"),
+            Genre("Supernatural"),
+            Genre("Tragedy"),
+            Genre("Webtoons"),
+            Genre("Yaoi"),
+            Genre("Yuri")
+    )
+
+}