diff --git a/gallery_dl/extractor/hbrowse.py b/gallery_dl/extractor/hbrowse.py
index 67da9011..0e252304 100644
--- a/gallery_dl/extractor/hbrowse.py
+++ b/gallery_dl/extractor/hbrowse.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2015 Mike Fährmann
+# Copyright 2015,2016 Mike Fährmann
 #
 # 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
@@ -10,52 +10,79 @@
 
 from .common import Extractor, Message
 from .. import text
+import json
 
-class HbrowseExtractor(Extractor):
-
+class HbrowseMangaExtractor(Extractor):
+    """Extractor for mangas from hbrowse.com"""
     category = "hbrowse"
-    directory_fmt = ["{category}", "{gallery-id} {title}"]
-    filename_fmt = "{category}_{gallery-id}_{num:>03}.{extension}"
+    subcategory = "manga"
+    pattern = [r"(?:https?://)?(?:www\.)?hbrowse\.com/(\d+)/?$"]
+    test = [("http://www.hbrowse.com/10363", {
+        "url": "4d9def5df21c23f8c3d36de2076c189c02ea43bd",
+    })]
+
+    def __init__(self, match):
+        Extractor.__init__(self)
+        self.gid = match.group(1)
+
+    def items(self):
+        yield Message.Version, 1
+        for url in self.get_chapters():
+            yield Message.Queue, url
+
+    def get_chapters(self):
+        """Return a list of all chapter urls"""
+        page = self.request("http://www.hbrowse.com/" + self.gid).text
+        needle = '<td class="listMiddle">\n<a class="listLink" href="'
+        return list(text.extract_iter(page, needle, '"'))
+
+
+class HbrowseChapterExtractor(Extractor):
+    """Extractor for manga-chapters from hbrowse.com"""
+    category = "hbrowse"
+    subcategory = "chapter"
+    directory_fmt = ["{category}", "{gallery-id} {title}", "c{chapter:>05}"]
+    filename_fmt = "{category}_{gallery-id}_{chapter:>05}_{num:>03}.{extension}"
     pattern = [r"(?:https?://)?(?:www\.)?hbrowse\.com/(\d+)/(c\d+)"]
-    url_base = "http://www.hbrowse.com/thumbnails/"
+    test = [("http://www.hbrowse.com/10363/c00000", {
+        "url": "634f4800858913f097bc3b62a8fedaf74b5254bd",
+        "keyword": "e6263b71f791000ad4bca58bc4d90f79e42e6be6",
+        "content": "44578ebbe176c2c27434966aef22945787e2781e",
+    })]
+    url_base = "http://www.hbrowse.com"
 
     def __init__(self, match):
         Extractor.__init__(self)
         self.gid, self.chapter = match.groups()
+        self.path = "/{}/{}/".format(self.gid, self.chapter)
 
     def items(self):
-        page = self.request(self.url_base + self.gid + "/" + self.chapter).text
+        page = self.request(self.url_base + self.path).text
         data = self.get_job_metadata(page)
         yield Message.Version, 1
         yield Message.Directory, data
         for num, url in enumerate(self.get_image_urls(page), 1):
             data["num"] = num
-            text.nameext_from_url(url, data)
-            yield Message.Url, url, data
+            yield Message.Url, url, text.nameext_from_url(url, data)
 
     def get_job_metadata(self, page):
         """Collect metadata for extractor-job"""
         data = {
             "category": self.category,
             'gallery-id': self.gid,
-            'chapter': int(self.chapter[1:]),
+            "chapter": int(self.chapter[1:]),
         }
         return text.extract_all(page, (
-            ('title' , '<td class="listLong">', '</td>'),
-            (None    , '<td class="listLong">', ''),
-            ('artist', 'title="">', '<'),
-            ('count' , '<td class="listLong">', ' '),
-            (None    , '<td class="listLong">', ''),
-            ('origin', 'title="">', '<'),
+            ('title'      , '<td class="listLong">', '</td>'),
+            (None         , '<td class="listLong">', ''),
+            ('artist'     , 'title="">', '<'),
+            ('count-total', '<td class="listLong">', ' '),
+            (None         , '<td class="listLong">', ''),
+            ('origin'     , 'title="">', '<'),
         ), values=data)[0]
 
-    @staticmethod
-    def get_image_urls(page):
+    def get_image_urls(self, page):
         """Yield all image-urls for a 'chapter'"""
-        base = "http://www.hbrowse.com/data/"
-        pos = 0
-        while True:
-            url, pos = text.extract(page, base, '"', pos)
-            if not url:
-                return
-            yield base + url.replace("zzz/", "")
+        base = self.url_base + "/data" + self.path
+        json_data = text.extract(page, ';list = ', ',"zzz"')[0] + "]"
+        return [base + name for name in json.loads(json_data)]