diff --git a/lib/goodstream-extractor/build.gradle.kts b/lib/goodstream-extractor/build.gradle.kts
new file mode 100644
index 0000000000..c26cbc8a82
--- /dev/null
+++ b/lib/goodstream-extractor/build.gradle.kts
@@ -0,0 +1,3 @@
+plugins {
+    id("lib-android")
+}
diff --git a/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt b/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt
new file mode 100644
index 0000000000..208a985164
--- /dev/null
+++ b/lib/goodstream-extractor/src/main/java/eu/kanade/tachiyomi/lib/goodstramextractor/GoodStreamExtractor.kt
@@ -0,0 +1,33 @@
+package eu.kanade.tachiyomi.lib.goodstramextractor
+
+import eu.kanade.tachiyomi.animesource.model.Video
+import eu.kanade.tachiyomi.network.GET
+import eu.kanade.tachiyomi.util.asJsoup
+import okhttp3.Headers
+import okhttp3.OkHttpClient
+
+class GoodStreamExtractor(private val client: OkHttpClient, private val headers: Headers) {
+
+    fun videosFromUrl(url: String, name: String): List<Video> {
+        val doc = client.newCall(GET(url, headers)).execute().asJsoup()
+        val videos = mutableListOf<Video>()
+
+        doc.select("script").forEach { script ->
+            if (script.data().contains(Regex("file|player"))) {
+                val urlRegex = Regex("file: \"(https:\\/\\/[a-z0-9.\\/-_?=&]+)\",")
+                urlRegex.find(script.data())?.groupValues?.get(1)?.let { link ->
+                    videos.add(
+                        Video(
+                            url = link,
+                            quality = name,
+                            videoUrl = link,
+                            headers = headers
+                        )
+                    )
+                }
+            }
+        }
+
+        return videos
+    }
+}
diff --git a/src/es/hackstore/build.gradle b/src/es/hackstore/build.gradle
index 71e6b63cbe..f6b5c4f823 100644
--- a/src/es/hackstore/build.gradle
+++ b/src/es/hackstore/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Hackstore'
     extClass = '.Hackstore'
-    extVersionCode = 15
+    extVersionCode = 16
 }
 
 apply from: "$rootDir/common.gradle"
@@ -13,4 +13,5 @@ dependencies {
     implementation(project(':lib:streamwish-extractor'))
     implementation(project(':lib:dood-extractor'))
     implementation(project(':lib:vidhide-extractor'))
+    implementation(project(':lib:goodstream-extractor'))
 }
diff --git a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
index 8e8220b60b..953475ada9 100644
--- a/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
+++ b/src/es/hackstore/src/eu/kanade/tachiyomi/animeextension/es/hackstore/Hackstore.kt
@@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.animesource.model.Video
 import eu.kanade.tachiyomi.animesource.online.ParsedAnimeHttpSource
 import eu.kanade.tachiyomi.lib.doodextractor.DoodExtractor
 import eu.kanade.tachiyomi.lib.filemoonextractor.FilemoonExtractor
+import eu.kanade.tachiyomi.lib.goodstramextractor.GoodStreamExtractor
 import eu.kanade.tachiyomi.lib.streamtapeextractor.StreamTapeExtractor
 import eu.kanade.tachiyomi.lib.streamwishextractor.StreamWishExtractor
 import eu.kanade.tachiyomi.lib.vidhideextractor.VidHideExtractor
@@ -179,6 +180,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
     private val streamWishExtractor by lazy { StreamWishExtractor(client, headers) }
     private val doodExtractor by lazy { DoodExtractor(client) }
     private val vidHideExtractor by lazy { VidHideExtractor(client, headers) }
+    private val goodStreamExtractor by lazy { GoodStreamExtractor(client, headers) }
 
     override fun videoListParse(response: Response): List<Video> {
         val document = response.asJsoup()
@@ -207,6 +209,9 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
                 server.contains("vidhide") || server.contains("vid.") -> {
                     vidHideExtractor.videosFromUrl(url) { "$prefix VidHide:$it" }
                 }
+                server.contains("goodstream") || server.contains("vidstream") -> {
+                    goodStreamExtractor.videosFromUrl(url, "$prefix GoodStream")
+                }
                 else -> emptyList()
             }
         }
@@ -247,7 +252,7 @@ class Hackstore : ConfigurableAnimeSource, ParsedAnimeHttpSource() {
 
         private const val PREF_SERVER_KEY = "preferred_server"
         private const val PREF_SERVER_DEFAULT = "StreamWish"
-        private val SERVER_LIST = arrayOf("DoodStream", "StreamTape", "Voe", "Filemoon", "StreamWish")
+        private val SERVER_LIST = arrayOf("DoodStream", "StreamTape", "Voe", "Filemoon", "StreamWish", "VidHide", "GoodStream")
     }
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {