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 9dc719bb891..4c202d355ad 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
@@ -24,7 +24,7 @@ abstract class KDocTemplate() : TextTemplate() {
         return if (f.owner is KClass) {
             "${href(f.owner)}#${f.link}"
         } else {
-            "#${f.link}"
+            "package-summary.html#${f.link}"
         }
     }
 
diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
index e2baf4a0928..d21c2282751 100644
--- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
+++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageFrameTemplate.kt
@@ -74,7 +74,7 @@ class PackageFrameTemplate(val model: KModel, p: KPackage) : PackageTemplateSupp
 <FONT CLASS="FrameItemFont">
 <BR>""")
             for (c in functions) {
-                println("<A HREF=\"${c.name}.html\" title=\"function in ${pkg.name}\" target=\"classFrame\"><I>${c.name}</I></A>")
+                println("<A HREF=\"${href(c)}\" title=\"function in ${pkg.name}\" target=\"classFrame\"><I>${c.name}</I></A>")
                 println("<BR>")
             }
             println("""</TR>
diff --git a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt
index e077dfde987..08f199efc9e 100644
--- a/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt
+++ b/kdoc/src/main/kotlin/org/jetbrains/kotlin/model/KotlinModel.kt
@@ -181,7 +181,6 @@ class KModel(var context: BindingContext, var title: String = "Documentation", v
             // lets remove the comment tokens
             //val lines = text.trim().split("\\n")
             text = text.trim().trim("/").trim("*").trim()
-
             // TODO convert any macros or wiki text!
             return text
         }