diff --git a/pelican/generators.py b/pelican/generators.py
index c50b55e1..c7239154 100755
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -165,8 +165,7 @@ class ArticlesGenerator(Generator):
 
             # if no category is set, use the name of the path as a category
             if 'category' not in metadatas.keys():
-                category = os.path.dirname(f).replace(
-                    os.path.expanduser(self.path)+'/', '')
+                category = os.path.basename(os.path.dirname(f))
 
                 if category == self.path:
                     category = self.settings['DEFAULT_CATEGORY']
diff --git a/pelican/readers.py b/pelican/readers.py
index 47e7d9f0..a8e8d63e 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -59,7 +59,25 @@ class MarkdownReader(object):
             )(value[0])
         return content, metadatas
 
-_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader}  # supported formats
+
+class HtmlReader(object):
+    _re = re.compile('\<\!\-\-\#\s?[A-z0-9_-]*\s?\:s?[A-z0-9\s_-]*\s?\-\-\>')
+
+    def read(self, filename):
+        """Parse content and metadata of (x)HTML files"""
+        content = open(filename)
+        metadatas = {'title':'unnamed'}
+        for i in self._re.findall(content):
+            key = i.split(':')[0][5:].strip()
+            value = i.split(':')[-1][:-3].strip()
+            print [key,value]
+            metadatas[key.lower()] = value
+
+        return content, metadatas
+
+
+
+_EXTENSIONS = {'rst': RstReader, 'md': MarkdownReader, 'html': HtmlReader}  # supported formats
 
 
 def read_file(filename, fmt=None):