diff --git a/assets/css/style.css b/assets/css/style.css
index e320b7914e..63ef54fc47 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -357,4 +357,9 @@ ul.navigation a {
 .warning {
 	color: #9F6000;
 	background-color: #FEEFB3;
+}
+
+.editThisPage {
+	position:absolute; bottom:2%; right:2%;
+	font-size:16px;
 }
\ No newline at end of file
diff --git a/assets/js/shiro-site.js b/assets/js/shiro-site.js
new file mode 100644
index 0000000000..9a74c7664d
--- /dev/null
+++ b/assets/js/shiro-site.js
@@ -0,0 +1,16 @@
+
+function addPageEditLink() {
+
+    var ghRepo = "apache/shiro-site";
+    var ghRelHref = "https://github.com/" + ghRepo + "/edit/master/";
+
+    var ghEditPageElement = $( "#ghEditPage" );
+    var editThisPageElement = $(".editThisPage");
+
+        if (ghEditPageElement && ghEditPageElement.val() && editThisPageElement) {
+            var relGHPage = ghEditPageElement.val();
+
+            var ghEditHref = ghRelHref + relGHPage;
+            editThisPageElement.append("<a href='" + ghEditHref + "'>Edit this Page on Github</a>");
+        }
+}
\ No newline at end of file
diff --git a/templates/default.vtl b/templates/default.vtl
index 407c4cbb6f..bcec194174 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -56,6 +56,7 @@
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/default.min.css" integrity="sha256-Zd1icfZ72UBmsId/mUcagrmN7IN5Qkrvh75ICHIQVTk=" crossorigin="anonymous" />
     <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js" integrity="sha256-s63qpgPYoQk+wv3U6WZqioVJrwFNBTgD4dkeegLuwvo=" crossorigin="anonymous"></script>
 
+    <script type="text/javascript" src="$root/assets/js/shiro-site.js"></script>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
     <script type="text/javascript" src="$root/assets/js/jquery_googleanalytics/jquery.google-analytics.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
@@ -65,6 +66,10 @@
             //Google Analytics
             jQuery.trackPage('UA-11551827-1');
         });
+
+        $( document ).ready(function() {
+            addPageEditLink();
+        });
     </script>
 </head>
 
@@ -102,6 +107,10 @@
             <a href="http://www.apache.org/foundation/contributing.html">Donate to the ASF</a> |
             <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
             <p>Copyright &copy; 2008-$year The Apache Software Foundation</p>
+
+            <div class="editThisPage">
+            </div>
+
             <div class="footer-shield"></div>
 
         </div> <!--END FOOTER WRAPPER-->