diff --git a/gallery_dl/extractor/hitomi.py b/gallery_dl/extractor/hitomi.py
index 24dea67f..bc733867 100644
--- a/gallery_dl/extractor/hitomi.py
+++ b/gallery_dl/extractor/hitomi.py
@@ -20,7 +20,7 @@ class HitomiGalleryExtractor(GalleryExtractor):
     test = (
         ("https://hitomi.la/galleries/867789.html", {
             "url": "cb759868d090fe0e2655c3e29ebf146054322b6d",
-            "keyword": "07536afc5696cb4983a4831ab4c70c1d155f875c",
+            "keyword": "067b5d9b9c0f98530cd5dd2444e0f5a5b4b00d38",
         }),
         ("https://hitomi.la/galleries/1036181.html", {
             # "aa" subdomain for gallery-id ending in 1 (#142)
@@ -51,9 +51,9 @@ class HitomiGalleryExtractor(GalleryExtractor):
             "parody"    : self._prep(extr('<td>Series</td><td>', '</td>')),
             "characters": self._prep(extr('<td>Characters</td><td>', '</td>')),
             "tags"      : self._prep(extr('<td>Tags</td><td>', '</td>')),
-            "date"      : extr('<span class="date">', '</span>'),
+            "date"      : self._date(extr('<span class="date">', '</span>')),
         }
-        if data["language"] == "N/A":
+        if data["language"] == "N/a":
             data["language"] = None
         data["lang"] = util.language_to_code(data["language"])
         return data
@@ -84,3 +84,7 @@ class HitomiGalleryExtractor(GalleryExtractor):
     @staticmethod
     def _prep_1(value):
         return text.remove_html(value).capitalize()
+
+    @staticmethod
+    def _date(value):
+        return text.parse_datetime(value + ":00", "%Y-%m-%d %H:%M:%S%z")