diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_faq_submission_form.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_faq_submission_form.tmpl
new file mode 100644
index 000000000..c45ffaf46
--- /dev/null
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_faq_submission_form.tmpl
@@ -0,0 +1,93 @@
+#PBtmpl0000000000000099
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if preview.title><p><b><tmpl_var preview.title></b></p></tmpl_if>
+<tmpl_if preview.content><p><tmpl_var preview.content></p></tmpl_if>
+
+<tmpl_if isReply>
+	<h2><tmpl_var message.header.label></h2>
+<tmpl_else>
+	<h2><tmpl_var question.header.label></h2>
+</tmpl_if>
+
+<tmpl_var form.header>
+<table class="faqSubmissionForm">
+	<tmpl_if isReply>
+		<tr>
+			<td><tmpl_var subject.label></td>
+			<td><tmpl_var title.form></td>
+		</tr>
+		<tr>
+			<td><tmpl_var message.label></td>
+			<td><tmpl_var content.form></td>
+		</tr>
+	<tmpl_else>
+		<tr>
+			<td><tmpl_var question.label></td>
+			<td><tmpl_var title.form.textarea></td>
+		</tr>
+		<tr>
+			<td><tmpl_var answer.label></td>
+			<td><tmpl_var content.form></td>
+		</tr>
+		<tmpl_if attachment.form>
+			<tr>
+				<td><tmpl_var attachment.label></td>
+				<td><tmpl_var attachment.form></td>
+			</tr>
+		</tmpl_if>
+	</tmpl_if>
+	<tr>
+		<td><tmpl_var contentType.label></td>
+		<td><tmpl_var contentType.form></td>
+	</tr>
+	<tmpl_if isNewPost>
+		<tmpl_unless user.isVisitor>
+			<tr>
+				<td><tmpl_var subscribe.label></td>
+				<td><tmpl_var subscribe.form></td>
+			</tr>
+		</tmpl_unless>
+		<tmpl_if isNewThread>
+			<tmpl_if user.isModerator>
+				<tr>
+					<td><tmpl_var lock.label></td>
+					<td><tmpl_var lock.form></td>
+				</tr>
+				<tr>
+					<td><tmpl_var stick.label></td>
+					<td><tmpl_var sticky.form></td>
+				</tr>
+			</tmpl_if>
+		</tmpl_if>
+	</tmpl_if>
+	<tr>
+		<td></td>
+		<td><tmpl_if usePreview><tmpl_var form.preview></tmpl_if><tmpl_var form.submit></td>
+	</tr>
+</table>
+<tmpl_var form.footer>
+
+<tmpl_if isReply>
+	<div class="faqSubmissionFormContent">
+		<b><tmpl_var reply.title></b><br /><br />
+		<tmpl_var reply.content>
+	</div>
+</tmpl_if>
+
+
+~~~
+table.faqSubmissionForm td
+{
+	font-family:arial;
+	font-size:9pt;
+}
+.faqSubmissionFormContent
+{
+	font-family:arial;
+	font-size:9pt;
+}
+h2
+{
+	font-family:arial;
+}