Index: readme/class-parser.php
===================================================================
--- readme/class-parser.php	(revision 3815)
+++ readme/class-parser.php	(working copy)
@@ -334,6 +334,40 @@
 			unset( $this->sections['screenshots'] );
 		}
 
+		// Display FAQs as a definition list.
+		if ( isset( $this->sections['faq'] ) ) {
+			$lines      = explode( "\n", $this->sections['faq'] );
+			$definition = false;
+
+			$this->sections['faq'] = "<dl>\n";
+			while ( ( $line = array_shift( $lines ) ) !== null ) {
+				$trimmed = trim( $line );
+				if ( empty( $trimmed ) ) {
+					continue;
+				}
+
+				if ( 0 === strpos( $trimmed, '<h4>' ) ) {
+					if ( $definition ) {
+						$this->sections['faq'] .= "</dd>\n";
+						$definition             = false;
+					}
+
+					$this->sections['faq'] .= '<dt>' . $this->sanitize_text( strip_tags( $line ) ) . "</dt>\n";
+					continue;
+				}
+
+				if ( ! $definition ) {
+					$this->sections['faq'] .= '<dd>' . $line;
+					$definition             = true;
+					continue;
+				}
+
+				$this->sections['faq'] .= "\n" . $line;
+			}
+
+			$this->sections['faq'] .= "</dd>\n</dl>";
+		}
+
 		// Filter the HTML.
 		$this->sections = array_map( array( $this, 'filter_text' ), $this->sections );
 
@@ -413,6 +447,9 @@
 			'strong'     => true,
 			'ul'         => true,
 			'ol'         => true,
+			'dl'         => true,
+			'dt'         => true,
+			'dd'         => true,
 			'li'         => true,
 			'h3'         => true,
 			'h4'         => true,