diff --git a/libraries/docs/website/src/main/apidocs/js/apidoc.js b/libraries/docs/website/src/main/apidocs/js/apidoc.js
index e69de29bb2d..d6a3f6ab336 100644
--- a/libraries/docs/website/src/main/apidocs/js/apidoc.js
+++ b/libraries/docs/website/src/main/apidocs/js/apidoc.js
@@ -0,0 +1,8 @@
+// This execute once the document loads.
+$(function(){
+	$("div.source-detail").hide(); 
+	$("div.doc-member").hover(
+      function() { $(this).children("div.source-detail").show(); },
+      function() { $(this).children("div.source-detail").hide(); }
+ 	);
+});
\ No newline at end of file
diff --git a/libraries/docs/website/src/main/apidocs/stylesheet.css b/libraries/docs/website/src/main/apidocs/stylesheet.css
index 1ff34e71b72..3a5d400d256 100644
--- a/libraries/docs/website/src/main/apidocs/stylesheet.css
+++ b/libraries/docs/website/src/main/apidocs/stylesheet.css
@@ -117,3 +117,10 @@ th, table { border-collapse:collapse;border-color: #E6E7E8; }
 
 .NavBarCell2    { background-color:#FFFFFF;}
 .NavBarCell3    { background-color:#FFFFFF;}
+
+div.doc-member.function {
+  border-bottom: 1px solid #E6E7E8;
+}
+div.source-detail {
+  float:right;
+}
\ No newline at end of file
diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
index 3ba281c7048..2247dd3eccc 100644
--- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
+++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/templates/PackageTemplateSupport.kt
@@ -119,6 +119,9 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() {
     }
 
     fun printFunctionDetail(function: KFunction): Unit {
+        println("""<div class="doc-member function">""")
+        println("""<div class="source-detail"><a href="${sourceHref(function)}"${function.sourceTargetAttribute()}>source</a></div>""")
+
         println("""<A NAME="${function.name}{${function.parameterTypeText}}"><!-- --></A><A NAME="${function.link}"><!-- --></A><H3>""")
         println("""${function.name}</H3>""")
         println("""<PRE>""")
@@ -128,7 +131,7 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() {
 
         printTypeParameters(function, " ")
         printReceiverType(function, " ", ".", " ")
-        print("""<A HREF="${sourceHref(function)}"${function.sourceTargetAttribute()}><B>${function.name}</B></A>""")
+        print("""<B>${function.name}</B>""")
         printParameters(function)
         print(": ")
         print(link(function.returnType))
@@ -160,7 +163,7 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() {
 </DD>
 </DL>
 */
-        println("""<HR>""")
+        println("""</div>""")
     }
 
     fun printPropertySummary(properties: Collection<KProperty>): Unit {
@@ -207,13 +210,17 @@ abstract class PackageTemplateSupport(open val pkg: KPackage) : KDocTemplate() {
         }
         */
         println("""</CODE></FONT></TD>""")
-        print("""<TD><CODE><B><A HREF="${sourceHref(property)}"${property.sourceTargetAttribute()}>${property.name}</A></B>: """)
+        print("""<TD>
+<div class="doc-member property">
+<div class="source-detail"><a HREF="${sourceHref(property)}"${property.sourceTargetAttribute()}>source</a></div>
+        <CODE><B>${property.name}</B>: """)
         print(link(property.returnType))
         //printParameters(property)
         println("""</CODE>""")
         println("""""")
         println("""<BR>""")
-        println("""&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${deprecated}&nbsp;${property.detailedDescription(this)}</TD>""")
+        println("""&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;${deprecated}&nbsp;${property.detailedDescription(this)}
+</div></TD>""")
         println("""</TR>""")
     }