diff --git a/gallery_dl/postprocessor/classify.py b/gallery_dl/postprocessor/classify.py
new file mode 100644
index 00000000..f3a09c5a
--- /dev/null
+++ b/gallery_dl/postprocessor/classify.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2018 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
+# published by the Free Software Foundation.
+
+"""Categorize files by media type"""
+
+from .common import PostProcessor
+import os
+
+
+class ClassifyPP(PostProcessor):
+
+    DEFAULT_MAP = {
+        "Music" : ("mp3", "aac", "flac", "ogg", "wma", "m4a", "wav"),
+        "Video" : ("flv", "ogv", "avi", "mp4", "mpg", "mpeg", "3gp", "mkv",
+                   "webm", "vob", "wmv"),
+        "Pictures" : ("jpg", "jpeg", "png", "gif", "bmp", "svg", "webp"),
+        "Archives" : ("zip", "rar", "7z", "tar", "gz", "bz2"),
+    }
+
+    def __init__(self, options):
+        PostProcessor.__init__(self)
+        mapping = options.get("map", self.DEFAULT_MAP)
+
+        self.map = {
+            ext: directory
+            for directory, exts in mapping.items()
+            for ext in exts
+        }
+
+    def run(self, pathfmt):
+        ext = pathfmt.keywords["extension"]
+
+        if ext in self.map:
+            directory = self.map[ext]
+            path = os.path.join(pathfmt.realdirectory, directory)
+            try:
+                os.mkdir(path)
+            except FileExistsError:
+                pass
+            os.replace(
+                pathfmt.realpath,
+                os.path.join(path, pathfmt.filename)
+            )
+
+
+__postprocessor__ = ClassifyPP