diff --git a/src/all/genkanio/build.gradle b/src/all/genkanio/build.gradle
index 942458f6c..28dd13482 100644
--- a/src/all/genkanio/build.gradle
+++ b/src/all/genkanio/build.gradle
@@ -5,8 +5,8 @@ apply plugin: 'kotlinx-serialization'
 ext {
     extName = 'Genkan.io'
     pkgNameSuffix = "all.genkanio"
-    extClass = '.GenkanIO'
-    extVersionCode = 3
+    extClass = '.GenkanIOFactory'
+    extVersionCode = 4
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIO.kt b/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIO.kt
index 0ef7e826b..70591d2ae 100644
--- a/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIO.kt
+++ b/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIO.kt
@@ -35,8 +35,7 @@ import rx.Observable
 import uy.kohesive.injekt.injectLazy
 import java.util.Calendar
 
-open class GenkanIO : ParsedHttpSource() {
-    override val lang = "all"
+open class GenkanIO(override val lang: String) : ParsedHttpSource() {
     final override val name = "Genkan.io"
     final override val baseUrl = "https://genkan.io"
     final override val supportsLatest = false
@@ -288,12 +287,22 @@ open class GenkanIO : ParsedHttpSource() {
             name = if (isTitleBlank(nameElem.text())) "Chapter ${numElem.text()}" else "Ch. ${numElem.text()}: ${nameElem.text()}"
             url = urlElem.select("a").attr("href").substringAfter(baseUrl)
             date_upload = parseRelativeDate(releasedElem.text())
-            scanlator = "${groupElem.text()} - ${languageElem.text()}"
+            scanlator = groupElem.text()
             chapter_number = numElem.text().toFloat()
         }
     }
 
-    override fun chapterListSelector() = "tbody > tr"
+    override fun chapterListSelector() = when (lang) {
+        "ar" -> "tbody > tr:contains(Arabic)"
+        "en" -> "tbody > tr:contains(English)"
+        "fr" -> "tbody > tr:contains(French)"
+        "pl" -> "tbody > tr:contains(Polish)"
+        "pt-BR" -> "tbody > tr:contains(Portuguese)"
+        "ru" -> "tbody > tr:contains(Russian)"
+        "es" -> "tbody > tr:contains(Spanish)"
+        "tr" -> "tbody > tr:contains(Turkish)"
+        else -> "tbody > tr"
+    }
     private fun chapterListNextPageSelector() = "a[rel=next]"
 
     // manga
diff --git a/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIOFactory.kt b/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIOFactory.kt
new file mode 100644
index 000000000..85d3891fb
--- /dev/null
+++ b/src/all/genkanio/src/eu/kanade/tachiyomi/extension/all/genkanio/GenkanIOFactory.kt
@@ -0,0 +1,17 @@
+package eu.kanade.tachiyomi.extension.all.genkanio
+
+import eu.kanade.tachiyomi.source.SourceFactory
+
+class GenkanIOFactory : SourceFactory {
+    override fun createSources() = listOf(
+        GenkanIO("all"),
+        GenkanIO("ar"),
+        GenkanIO("en"),
+        GenkanIO("fr"),
+        GenkanIO("pl"),
+        GenkanIO("pt-BR"),
+        GenkanIO("ru"),
+        GenkanIO("es"),
+        GenkanIO("tr"),
+    )
+}