diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index b5b90b31a5..21bc15480d 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2223,6 +2223,10 @@ settings.advanced_settings = Advanced Settings
 settings.wiki_desc = Enable Repository Wiki
 settings.use_internal_wiki = Use Built-In Wiki
 settings.default_wiki_branch_name = Default Wiki Branch Name
+settings.default_wiki_format = Default Wiki Format
+settings.default_wiki_format.markdown = Markdown
+settings.default_wiki_format.org = Org-mode
+settings.default_wiki_format.both = Both
 settings.failed_to_change_default_wiki_branch = Failed to change the default wiki branch.
 settings.use_external_wiki = Use External Wiki
 settings.external_wiki_url = External Wiki URL
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index b4680431b8..eaec0fa7e7 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -337,6 +337,34 @@
 							<label>{{ctx.Locale.Tr "repo.settings.default_wiki_branch_name"}}</label>
 							<input name="default_wiki_branch" value="{{.Repository.DefaultWikiBranch}}">
 						</div>
+						<div class="field">
+							<label>{{ctx.Locale.Tr "repo.settings.default_wiki_format"}}</label>
+							{{$defaultWikiFormat := .Repository.DefaultWikiFormat}}
+							<div class="ui dropdown selection">
+								<select name="default_wiki_format">
+									<option value="markdown" {{if or (not $defaultWikiFormat) (eq $defaultWikiFormat "markdown")}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}}</option>
+									<option value="org" {{if eq $defaultWikiFormat "org"}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.default_wiki_format.org"}}</option>
+									<option value="both" {{if eq $defaultWikiFormat "both"}}selected{{end}}>{{ctx.Locale.Tr "repo.settings.default_wiki_format.both"}}</option>
+								</select>
+								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+								<div class="default text">
+									{{if (eq $defaultWikiFormat "markdown")}}
+										{{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}}
+									{{else if (eq $defaultWikiFormat "org")}}
+										{{ctx.Locale.Tr "repo.settings.default_wiki_format.org"}}
+									{{else if (eq $defaultWikiFormat "both")}}
+										{{ctx.Locale.Tr "repo.settings.default_wiki_format.both"}}
+									{{else}}
+										{{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}}
+									{{end}}
+								</div>
+								<div class="menu">
+									<div class="item" data-value="markdown">{{ctx.Locale.Tr "repo.settings.default_wiki_format.markdown"}}</div>
+									<div class="item" data-value="org">{{ctx.Locale.Tr "repo.settings.default_wiki_format.org"}}</div>
+									<div class="item" data-value="both">{{ctx.Locale.Tr "repo.settings.default_wiki_format.both"}}</div>
+								</div>
+							</div>
+						</div>
 					</div>
 					<div class="field">
 						<div class="ui radio checkbox{{if $isExternalWikiGlobalDisabled}} disabled{{end}}"{{if $isExternalWikiGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>