diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index ef66e9ce45ec4..dc0f8d3b2f2af 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1015,8 +1015,8 @@ new_repo_helper = A repository contains all project files, including revision hi
 owner = Owner
 owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit.
 repo_name = Repository Name
-repo_name_profile_public_hint= .profile is a special repository that you can use to add README.md to your public organization profile, visible to anyone. Make sure it’s public and initialize it with a README in the profile directory to get started.
-repo_name_profile_private_hint = .profile-private is a special repository that you can use to add a README.md to your organization member profile, visible only to organization members. Make sure it’s private and initialize it with a README in the profile directory to get started.
+repo_name_profile_public_hint= .profile is a special repository that you can use to add README.md and Wiki to your public organization profile, visible to anyone. Make sure it’s public and initialize it with a README in the profile directory to get started.
+repo_name_profile_private_hint = .profile-private is a special repository that you can use to add a README.md and Wiki to your organization member profile, visible only to organization members. Make sure it’s private and initialize it with a README in the profile directory to get started.
 repo_name_helper = Good repository names use short, memorable and unique keywords. A repository named '.profile' or '.profile-private' could be used to add a README.md for the user/organization profile.
 repo_size = Repository Size
 template = Template
@@ -2865,8 +2865,8 @@ teams.invite.by = Invited by %s
 teams.invite.description = Please click the button below to join the team.
 
 view_as_role = View as: %s
-view_as_public_hint = You are viewing the README a public user.
-view_as_member_hint = You are viewing the README a member of this organization.
+view_as_public_hint = You are viewing the README/Wiki as a public user.
+view_as_member_hint = You are viewing the README/Wiki as a member of this organization.
 
 [admin]
 maintenance = Maintenance
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 277adb60ca0e7..6089dc1fd356d 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -179,6 +179,9 @@ func prepareOrgProfileReadme(ctx *context.Context, prepareResult *shared_user.Pr
 		return false
 	}
 
+	ctx.Data["HasOrgProfileWiki"] = profileRepo.HasWiki()
+	ctx.Data["OrgProfileRepo"] = profileRepo
+
 	readmeBytes, err := readmeBlob.GetBlobContent(setting.UI.MaxDisplayFileSize)
 	if err != nil {
 		log.Error("failed to GetBlobContent for profile %q (view as %q) readme: %v", profileRepo.FullName(), viewAs, err)
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index db750692bff18..af45a62665042 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -44,6 +44,12 @@
 					<div class="tw-my-2">
 						{{if .IsViewingOrgAsMember}}{{ctx.Locale.Tr "org.view_as_member_hint"}}{{else}}{{ctx.Locale.Tr "org.view_as_public_hint"}}{{end}}
 					</div>
+					{{if .HasOrgProfileWiki}}
+					{{/* FIXME:  the "view as" affects the "wiki link", it can't be in the menu tab. Need to figure out some better UI/UX solutions. */}}
+					<a class="tw-my-2" href="{{$.OrgProfileRepo.Link}}/wiki">
+						{{svg "octicon-book"}} {{ctx.Locale.Tr "repo.wiki"}}
+					</a>
+					{{end}}
 				</div>
 				{{end}}