diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75c16cf1..cb394744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## Unreleased
+- Fixed extraction issues for `mangastream`
+
 ## 1.2.0 - 2018-02-16
 - Added support for:
   - `paheal` - https://rule34.paheal.net/ ([#69](https://github.com/mikf/gallery-dl/issues/69))
diff --git a/gallery_dl/extractor/mangastream.py b/gallery_dl/extractor/mangastream.py
index 14e48553..51a469a3 100644
--- a/gallery_dl/extractor/mangastream.py
+++ b/gallery_dl/extractor/mangastream.py
@@ -44,9 +44,8 @@ class MangastreamChapterExtractor(ChapterExtractor):
 
     def get_images(self, page):
         while True:
-            next_url, pos = text.extract(
-                page, '<div class="page">\n<a href="', '"')
-            image_url, pos = text.extract(
-                page, '<img id="manga-page" src="', '"', pos)
+            pos = page.index(' class="page"')
+            next_url = text.extract(page, ' href="', '"', pos)[0]
+            image_url = text.extract(page, ' src="', '"', pos)[0]
             yield urljoin(self.base_url, image_url), None
             page = self.request(urljoin(self.base_url, next_url)).text
diff --git a/gallery_dl/version.py b/gallery_dl/version.py
index 314f898f..f7d4f9e3 100644
--- a/gallery_dl/version.py
+++ b/gallery_dl/version.py
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-__version__ = "1.2.0"
+__version__ = "1.2.1-dev"