diff --git a/markup/lexer.go b/markup/lexer.go
index 27ba479..569023a 100644
--- a/markup/lexer.go
+++ b/markup/lexer.go
@@ -121,8 +121,8 @@ preformattedState:
 
 listState:
 	switch {
-	case startsWith("*"):
-		state.buf += fmt.Sprintf("\t<li>%s</li>\n", remover("*")(line))
+	case startsWith("* "):
+		state.buf += fmt.Sprintf("\t<li>%s</li>\n", ParagraphToHtml(line[2:]))
 	case startsWith("```"):
 		state.where = "pre"
 		addLine(state.buf + "</ul>")
@@ -176,6 +176,8 @@ normalState:
 
 	case startsWith("<="):
 		addLine(parseTransclusion(line, state.name))
+	case line == "----":
+		*ast = append(*ast, Line{id: -1, contents: "<hr/>"})
 	default:
 		addLine(fmt.Sprintf("<p id='%d'>%s</p>", state.id, ParagraphToHtml(line)))
 	}
diff --git a/markup/parser.go b/markup/parser.go
index 0a77a67..66f81a0 100644
--- a/markup/parser.go
+++ b/markup/parser.go
@@ -13,7 +13,7 @@ func Parse(ast []Line, from, to int, state GemParserState) (html string) {
 		return "Transclusion depth limit"
 	}
 	for _, line := range ast {
-		if line.id >= from && (line.id <= to || to == 0) {
+		if line.id >= from && (line.id <= to || to == 0) || line.id == -1 {
 			switch v := line.contents.(type) {
 			case Transclusion:
 				html += Transclude(v, state)
diff --git a/metarrhiza b/metarrhiza
index 58d000e..2e2e3a7 160000
--- a/metarrhiza
+++ b/metarrhiza
@@ -1 +1 @@
-Subproject commit 58d000edaa4f06586accc6199190ca69bebf2ad4
+Subproject commit 2e2e3a70f9de67b54f912dd9fdaa04497bf795b0