diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
index 4ae576058ae..d4a9cb7dca2 100644
--- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
+++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/KDocTemplate.kt
@@ -54,12 +54,13 @@ abstract class KDocTemplate() : TextTemplate() {
     }
 
     open fun sourceHref(f: KFunction): String {
-        return if (f.owner is KClass) {
-            "${rootHref(f.owner.pkg)}src-html/${f.owner.simpleName}.html#line.${f.sourceLine}"
-        } else {
+        val owner = f.owner
+        return if (owner is KClass) {
+            "${rootHref(owner.pkg)}src-html/${owner.simpleName}.html#line.${f.sourceLine}"
+        } else if (owner is KPackage) {
             // TODO how to find the function in a package???
-            ""
-        }
+            "${rootHref(owner)}src-html/namespace.html#line.${f.sourceLine}"
+        } else href(f)
     }
 
     open fun link(c: KClass, fullName: Boolean = false): String {
diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
index d362e07aa56..c5983170aaa 100644
--- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
+++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/OverviewSummaryTemplate.kt
@@ -104,7 +104,7 @@ ${model.title}
 </TR>""")
         for (p in model.packages) {
             println("""<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="${p.nameAsPath}/package-summary.html">${p.nameAsPath}</A></B></TD>
+<TD WIDTH="20%"><B><A HREF="${p.nameAsPath}/package-summary.html">${p.name}</A></B></TD>
 <TD>${p.description}</TD>
 </TR>""")
         }
diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
index c0d22cb2e92..6884b94fbc2 100644
--- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
+++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
@@ -91,7 +91,7 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() {
     }
 
     fun printFunctionDetail(function: KFunction): Unit {
-        println("""<A NAME="${function.name}{${function.parameterTypeText}})"><!-- --></A><A NAME="${function.name}(${function.typeParametersText})"><!-- --></A><H3>""")
+        println("""<A NAME="${function.name}{${function.parameterTypeText}}"><!-- --></A><A NAME="${function.link}"><!-- --></A><H3>""")
         println("""${function.name}</H3>""")
         println("""<PRE>""")
         println("""<FONT SIZE="-1">""")