diff --git a/nhentai/doujinshi.py b/nhentai/doujinshi.py
index 9f82c32..a36038c 100644
--- a/nhentai/doujinshi.py
+++ b/nhentai/doujinshi.py
@@ -41,7 +41,7 @@ class Doujinshi(object):
         name_format = name_format.replace('%a', self.info.artists)
         name_format = name_format.replace('%t', self.name)
         name_format = name_format.replace('%s', self.info.subtitle)
-        self.filename = name_format
+        self.filename = format_filename(name_format)
 
     def __repr__(self):
         return '<Doujinshi: {0}>'.format(self.name)
diff --git a/nhentai/utils.py b/nhentai/utils.py
index 260edb1..c089f25 100644
--- a/nhentai/utils.py
+++ b/nhentai/utils.py
@@ -178,7 +178,6 @@ an invalid filename.
 """
     valid_chars = "-_.()[] %s%s" % (string.ascii_letters, string.digits)
     filename = ''.join(c for c in s if c in valid_chars)
-    filename = filename.replace(' ', '_')  # I don't like spaces in filenames.
     if len(filename) > 100:
         filename = filename[:100] + '...]'