diff --git a/formats/mf2.php b/formats/mf2.php
new file mode 100644
index 0000000..a80605a
--- /dev/null
+++ b/formats/mf2.php
@@ -0,0 +1,35 @@
+<?php
+
+class MF2Format implements Format {
+    public $title = 'mf2';
+    public $mime = 'text/html';
+    public $ext = 'html';
+
+    public function export( $data ) {
+        $out = '';
+        foreach( $data['objs'] as $obj ) {
+            // Skip polygons and lines since they don't have a good microformats representation
+            if( count($obj['coords']) == 1 ) {
+                foreach( $obj['coords'] as $coord ) {
+                    $out .= '<p class="h-geo">' . "\n";
+                    if( isset($obj['text']) ) {
+                        $out .= "\t" . '<span class="p-name p-summary">' . htmlspecialchars($obj['text']) . '</span>' . "\n";
+                    }
+                    $out .= "\t" . '<data class="p-latitude">' . $coord[0] . '</data>' . "\n";
+                    $out .= "\t" . '<data class="p-longitude">' . $coord[1] . '</data>' . "\n";
+                    $out .= '</p>' . "\n";
+                }
+            }
+        }
+        return $out;
+    }
+
+    public function test( $header ) {
+        return false;
+    }
+
+    public function import( $file ) {
+    }
+}
+
+$formats['mf2'] = new MF2Format();
diff --git a/index.php b/index.php
index ec3b484..b9c6e95 100644
--- a/index.php
+++ b/index.php
@@ -118,7 +118,7 @@
     }
 }
 
-if( isset($_REQUEST['format']) && preg_match('/^[a-z]+$/', $_REQUEST['format']) ) {
+if( isset($_REQUEST['format']) && preg_match('/^[a-z0-9]+$/', $_REQUEST['format']) ) {
     $format = $_REQUEST['format'];
     header('Access-Control-Allow-Origin: *');
     $result = export($format, $title, $bbcode, isset($scodeid) ? $scodeid : '', !isset($_REQUEST['direct']));