diff --git a/mod/quiz/match.html b/mod/quiz/match.html
new file mode 100644
index 0000000000000..a9c4d36bb1776
--- /dev/null
+++ b/mod/quiz/match.html
@@ -0,0 +1,81 @@
+<FORM name="theform" method="post" <?=$onsubmit ?> action="question.php">
+<CENTER>
+<TABLE cellpadding=5>
+<TR valign=top>
+    <TD align=right><P><B><? print_string("category", "quiz") ?>:</B></P></TD>
+    <TD>
+    <?  choose_from_menu($categories, "category", "$question->category", ""); ?>
+    </TD>
+</TR>
+<TR valign=top>
+    <TD align=right><P><B><? print_string("questionname", "quiz") ?>:</B></P></TD>
+    <TD>
+        <INPUT type="text" name="name" size=40 value="<? p($question->name) ?>">
+        <? if (isset($err["name"])) formerr($err["name"]); ?>
+    </TD>
+</TR>
+<TR valign=top>
+    <TD align=right><P><B><? print_string("question", "quiz") ?>:</B></P></TD>
+    <TD>
+        <? if (isset($err["questiontext"])) {
+               formerr($err["questiontext"]); 
+               echo "<BR \>";
+           }
+           print_textarea($usehtmleditor, 15, 60, 595, 300, "questiontext", $question->questiontext);
+           if ($usehtmleditor) {
+               helpbutton("richtext", get_string("helprichtext"), "moodle");
+           } else {
+               helpbutton("text", get_string("helptext"), "moodle");
+           }
+        ?>
+    </TD>
+</TR>
+<TR valign=top>
+    <TD align=right><P><B><? print_string("imagedisplay", "quiz") ?>:</B></P></TD>
+    <TD>
+    <?  if (empty($images)) {
+            print_string("noimagesyet");
+        } else {
+            choose_from_menu($images, "image", "$question->image", get_string("none"),"","");
+        }
+    ?>
+    </TD>
+</TR>
+
+<TR valign=top>
+    <TD align=right><P><B><? print_string("choices", "quiz") ?></B>:</P></TD>
+    <TD><P><? print_string("filloutthreequestions", "quiz") ?></P>
+    </TD>
+</TR>
+
+<?PHP 
+    for ($i=1; $i<=QUIZ_MAX_NUMBER_ANSWERS; $i++) {
+?>
+
+<TR valign=top>
+    <TD align=right><P><B><? echo get_string("question", "quiz")." $i";  ?> :</B></P></TD>
+    <TD>
+        <textarea name="subquestions[]" rows=5 cols=50><? p($subquestions[$i-1]) ?></textarea>
+        <br \>
+        <? echo get_string("matchanswer", "quiz")." $i";  ?>&nbsp;&nbsp;
+        <INPUT type="text" name="subanswers[]" size=50 value="<? p($subanswers[$i-1]) ?>">
+    </TD>
+</TR>
+
+<?PHP
+    }
+?>
+
+</TABLE>
+
+<INPUT type="hidden" name=id value="<? p($question->id) ?>">
+<INPUT type="hidden" name=qtype value="<? p($question->qtype) ?>">
+<INPUT type="submit" value="<? print_string("savechanges") ?>">
+
+</CENTER>
+</FORM>
+<? 
+   if ($usehtmleditor) { 
+       print_richedit_javascript("theform", "questiontext", "no");
+   }
+?>