diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index e3b4ea7e..df61f122 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -1371,6 +1371,12 @@ Consider all listed sites to potentially be NSFW.
     <td>Posts, Tag Searches</td>
     <td></td>
 </tr>
+<tr>
+    <td>Rule34Hentai</td>
+    <td>https://rule34hentai.net/</td>
+    <td>Posts, Tag Searches</td>
+    <td></td>
+</tr>
 
 <tr>
     <td colspan="4"><strong>szurubooru Instances</strong></td>
diff --git a/gallery_dl/extractor/shimmie2.py b/gallery_dl/extractor/shimmie2.py
index 299b2394..725d05d2 100644
--- a/gallery_dl/extractor/shimmie2.py
+++ b/gallery_dl/extractor/shimmie2.py
@@ -35,9 +35,8 @@ class Shimmie2Extractor(BaseExtractor):
 
         if self.category == "giantessbooru":
             self.posts = self._posts_giantessbooru
-
-        if self.category == "rule34hentai":
-            self.posts = self._posts_giantessbooru
+        elif self.category == "rule34hentai":
+            self.posts = self._posts_rule34hentai
 
     def items(self):
         data = self.metadata()
@@ -301,8 +300,8 @@ class Shimmie2PostExtractor(Shimmie2Extractor):
             "tags"    : extr(": ", "<").partition(" - ")[0].rstrip(")"),
             "md5"     : extr("/_thumbs/", "/"),
             "file_url": self.root + (
-                extr("id='main_image' src=\"", "\"") or
-                extr("<source src=\"", "\"")).lstrip("."),
+                extr('id="main_image" src="', '"') or
+                extr('<source src="', '"')).lstrip("."),
             "width"   : extr("data-width=", " ").strip("\"'"),
             "height"  : extr("data-height=", ">").partition(
                 " ")[0].strip("\"'"),
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index 2a625e76..11473b53 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -106,6 +106,7 @@ CATEGORY_MAP = {
     "redgifs"        : "RedGIFs",
     "rozenarcana"    : "Rozen Arcana",
     "rule34"         : "Rule 34",
+    "rule34hentai"   : "Rule34Hentai",
     "rule34us"       : "Rule 34",
     "sankaku"        : "Sankaku Channel",
     "sankakucomplex" : "Sankaku Complex",
diff --git a/test/results/rule34hentai.py b/test/results/rule34hentai.py
new file mode 100644
index 00000000..1d3cb291
--- /dev/null
+++ b/test/results/rule34hentai.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+from gallery_dl.extractor import shimmie2
+
+
+__tests__ = (
+{
+    "#url"     : "https://rule34hentai.net/post/list/mizuki_kotora/1",
+    "#category": ("shimmie2", "rule34hentai", "tag"),
+    "#class"   : shimmie2.Shimmie2TagExtractor,
+    "#urls"    : (
+        "https://rule34hentai.net/_images/7f3a411263d0f6de936e47ae8f9d35fb/332%20-%20Darkstalkers%20Felicia%20mizuki_kotora.jpeg",
+        "https://rule34hentai.net/_images/1a8eca7c04f8bf325bc993c5751a91c4/264%20-%20Darkstalkers%20Felicia%20mizuki_kotora.jpeg",
+        "https://rule34hentai.net/_images/09511511c4c9e9e1f9b795e059a60832/259%20-%20Darkstalkers%20Felicia%20mizuki_kotora.jpeg",
+    ),
+
+    "extension"  : "jpeg",
+    "file_url"   : r"re:https://rule34hentai.net/_images/.+\.jpeg",
+    "filename"   : r"re:\d+ - \w+",
+    "height"     : range(496, 875),
+    "id"         : range(259, 332),
+    "md5"        : r"re:^[0-9a-f]{32}$",
+    "search_tags": "mizuki_kotora",
+    "size"       : int,
+    "tags"       : str,
+    "width"      : range(500, 850),
+},
+
+{
+    "#url"     : "https://rule34hentai.net/post/view/264",
+    "#category": ("shimmie2", "rule34hentai", "post"),
+    "#class"   : shimmie2.Shimmie2PostExtractor,
+    "#urls"        : "https://rule34hentai.net/_images/1a8eca7c04f8bf325bc993c5751a91c4/264%20-%20Darkstalkers%20Felicia%20mizuki_kotora.jpg",
+    "#sha1_content": "6c23780bb78673cbff1bca9accb77ea11ec734f3",
+
+    "extension": "jpg",
+    "file_url" : "https://rule34hentai.net/_images/1a8eca7c04f8bf325bc993c5751a91c4/264%20-%20Darkstalkers%20Felicia%20mizuki_kotora.jpg",
+    "filename" : "264 - Darkstalkers Felicia mizuki_kotora",
+    "height"   : 875,
+    "id"       : 264,
+    "md5"      : "1a8eca7c04f8bf325bc993c5751a91c4",
+    "size"     : 0,
+    "tags"     : "Darkstalkers Felicia mizuki_kotora",
+    "width"    : 657,
+},
+
+)