diff --git a/pelican/readers.py b/pelican/readers.py
index ad2b0f74..74cec02f 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -228,7 +228,7 @@ def read_file(filename, fmt=None, settings=None):
     content, metadata = reader.read(filename)
 
     # eventually filter the content with typogrify if asked so
-    if settings and settings['TYPOGRIFY']:
+    if settings and settings.get('TYPOGRIFY'):
         from typogrify.filters import typogrify
         content = typogrify(content)
         metadata['title'] = typogrify(metadata['title'])
diff --git a/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst b/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
new file mode 100644
index 00000000..43f05a15
--- /dev/null
+++ b/tests/content/2012-11-29_rst_w_filename_meta#foo-bar.rst
@@ -0,0 +1,6 @@
+
+Rst with filename metadata
+##########################
+
+:category: yeah
+:author: Alexis Métaireau
diff --git a/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md b/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
new file mode 100644
index 00000000..cdccfc8a
--- /dev/null
+++ b/tests/content/2012-11-30_md_w_filename_meta#foo-bar.md
@@ -0,0 +1,6 @@
+category: yeah
+author: Alexis Métaireau
+
+Markdown with filename metadata
+===============================
+
diff --git a/tests/test_readers.py b/tests/test_readers.py
index c9d22c18..dcfee809 100644
--- a/tests/test_readers.py
+++ b/tests/test_readers.py
@@ -34,6 +34,50 @@ class RstReaderTest(unittest.TestCase):
         for key, value in expected.items():
             self.assertEquals(value, metadata[key], key)
 
+    def test_article_with_filename_metadata(self):
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={})
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': datetime.datetime(2012, 11, 29),
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-29_rst_w_filename_meta#foo-bar.rst'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})_' \
+                                         '_(?P<Slug>.*)' \
+                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'title': 'Rst with filename metadata',
+            'date': datetime.datetime(2012, 11, 29),
+            'slug': 'article_with_filename_metadata',
+            'mymeta': 'foo',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
     def test_article_metadata_key_lowercase(self):
         """Keys of metadata should be lowercase."""
         reader = readers.RstReader({})
@@ -80,6 +124,13 @@ class MdReaderTest(unittest.TestCase):
         
         self.assertEqual(content, expected)
 
+        expected = {
+            'category': 'test',
+            'title': 'Test md File',
+        }
+        for key, value in metadata.items():
+            self.assertEquals(value, expected[key], key)
+
     @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
     def test_article_with_mkd_extension(self):
         # test to ensure the mkd extension is being processed by the correct reader
@@ -110,6 +161,48 @@ class MdReaderTest(unittest.TestCase):
 
         self.assertEqual(content, expected)
 
+    @unittest.skipUnless(readers.Markdown, "markdown isn't installed")
+    def test_article_with_filename_metadata(self):
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={})
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2}).*'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'date': datetime.datetime(2012, 11, 30),
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
+        content, metadata = readers.read_file(
+                _filename('2012-11-30_md_w_filename_meta#foo-bar.md'),
+                settings={
+                    'FILENAME_METADATA': '(?P<date>\d{4}-\d{2}-\d{2})'
+                                         '_(?P<Slug>.*)'
+                                         '#(?P<MyMeta>.*)-(?P<author>.*)'
+                    })
+        expected = {
+            'category': 'yeah',
+            'author': u'Alexis Métaireau',
+            'date': datetime.datetime(2012, 11, 30),
+            'slug': 'md_w_filename_meta',
+            'mymeta': 'foo',
+        }
+        for key, value in expected.items():
+            self.assertEquals(value, metadata[key], key)
+
 class AdReaderTest(unittest.TestCase):
 
     @unittest.skipUnless(readers.asciidoc, "asciidoc isn't installed")