diff --git a/README.rst b/README.rst
index 13355002..2779f707 100644
--- a/README.rst
+++ b/README.rst
@@ -4,8 +4,9 @@ gallery-dl
 
 *gallery-dl* is a command-line program to download image-galleries and
 -collections from several image hosting sites such as pixiv.net, exhentai.org,
-gelbooru.com and several more (see `Supported Sites`_). It requires Python 3.3+
-to run and works on Unix-like systems as well as on Windows.
+danbooru.donmai.us and several more (see `Supported Sites`_).
+It requires Python 3.3+ to run and works on Unix-like systems as well as on
+Windows.
 
 
 |pypi| |build|
@@ -20,14 +21,14 @@ Installation via pip
 --------------------
 
 The stable releases of *gallery-dl* are distributed on PyPI_ and can be
-easily installed or upgraded to the latest version using pip_:
+easily installed or upgraded using pip_:
 
 .. code:: bash
 
     $ pip install --upgrade gallery-dl
 
-Installing the latest dev-version directly from GitHub can be done via
-pip as well:
+Installing the latest dev-version directly from GitHub can be done with
+pip_ as well:
 
 .. code:: bash
 
@@ -83,11 +84,11 @@ See also :code:`gallery-dl --help`.
 Examples
 --------
 
-Download images; in this case from gelbooru via tag search for 'bonocho':
+Download images; in this case from danbooru via tag search for 'bonocho':
 
 .. code:: bash
 
-    $ gallery-dl "http://gelbooru.com/index.php?page=post&s=list&tags=bonocho"
+    $ gallery-dl http://danbooru.donmai.us/posts?tags=bonocho
 
 
 Get the direct URL of an image from a site that requires authentication:
@@ -159,7 +160,7 @@ Username & Password
 Some extractors require you to provide valid login-credentials in the form of
 a username & password pair.
 This is necessary for ``pixiv``, ``nijie`` and ``seiga`` and optional
-(but strongly recommended) for ``exhentai`` and ``batoto``.
+(but strongly recommended) for ``exhentai``,  ``batoto`` and ``sankaku``.
 
 You can set the necessary information in your configuration file
 (cf. gallery-dl.conf_)
diff --git a/setup.py b/setup.py
index 8caa88cd..d599eb12 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,7 @@ def read(fname):
 exec(read("gallery_dl/version.py"))
 
 DESCRIPTION = ("Command-line program to download image galleries and "
-               "collections from pixiv, exhentai, danbooru, gelbooru, nijie "
-               "and more")
+               "collections from pixiv, exhentai, danbooru and more")
 LONG_DESCRIPTION = read("README.rst")
 
 if "py2exe" in sys.argv:
@@ -44,7 +43,7 @@ if "py2exe" in sys.argv:
         "options": {"py2exe": {
             "bundle_files": 0,
             "compressed": 1,
-            "optimize": 2,
+            "optimize": 1,
             "dist_dir": ".",
             "packages": ["gallery_dl"],
             "dll_excludes": ["w9xpopen.exe"],
@@ -87,21 +86,18 @@ setup(
     ],
     keywords="image gallery downloader crawler scraper",
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Intended Audience :: End Users/Desktop",
         "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX",
-        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3 :: Only",
-        "Topic :: Internet",
         "Topic :: Internet :: WWW/HTTP",
-        "Topic :: Multimedia",
         "Topic :: Multimedia :: Graphics",
     ],
     test_suite="test",