diff --git a/cmd/droned/assets/css/drone.css b/cmd/droned/assets/css/drone.css
index 4676616b2..171c1b2d3 100644
--- a/cmd/droned/assets/css/drone.css
+++ b/cmd/droned/assets/css/drone.css
@@ -1082,3 +1082,16 @@ ul.account-radio-group li img {
 .url {
   word-break: break-all;
 }
+#follow {
+  position: absolute;
+  z-index: 1000;
+  right: 1em;
+  top: .5em;
+  padding: 0 1em;
+  border-radius: 7px;
+  background: #999;
+  cursor: pointer;
+}
+#follow-container {
+  position: relative;
+}
diff --git a/cmd/droned/assets/css/drone.less b/cmd/droned/assets/css/drone.less
index 8e4263aaf..178d1ede2 100644
--- a/cmd/droned/assets/css/drone.less
+++ b/cmd/droned/assets/css/drone.less
@@ -1271,3 +1271,19 @@ pre {
 .url {
   word-break: break-all;
 }
+
+#follow {
+  position: absolute;
+  z-index: 1000;
+  right: 1em;
+  top: .5em;
+  padding: 0 1em;
+  border-radius: 7px;
+  background: #999;
+  cursor: pointer;
+}
+
+#follow-container {
+  position: relative;
+}
+
diff --git a/pkg/template/pages/repo_commit.html b/pkg/template/pages/repo_commit.html
index 985e733b4..cb433f27a 100644
--- a/pkg/template/pages/repo_commit.html
+++ b/pkg/template/pages/repo_commit.html
@@ -44,15 +44,37 @@
 				<dd>{{ .Commit.Message }}</dd>
 			</div>
 		</div>
-		<pre id="stdout"></pre>
+		<div id="follow-container">
+			<span id="follow">Follow</span>
+			<pre id="stdout"></pre>
+		</div>
 	</div><!-- ./container -->
 {{ end }}
 
 {{ define "script" }}
 	<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.1.0/jquery.timeago.js"></script>
 	<script>
+		window.autofollow = false;
+		window.autofollow_ignore = false;
 		$(document).ready(function() {
 			$(".timeago").timeago();
+			$("#follow").bind("click", function(ev) {
+				if (window.autofollow) {
+					window.autofollow = false;
+					$("#follow").text("Follow");
+				} else {
+					window.autofollow = true;
+					$("#follow").text("Stop following");
+				}
+			});
+			$(window).bind("scroll", function(ev) {
+				if (window.autofollow_ignore) {
+					window.autofollow_ignore = false;
+				} else {
+					window.autofollow = false;
+					$("#follow").text("Follow");
+				}
+			});
 		});
 	</script>
 
@@ -124,7 +146,10 @@
 		outputWS.onclose = function (e) { window.location.reload(); };
 		outputWS.onmessage = function (e) { 
 			outputBox.innerHTML += formatLine(e.data);
-			window.scrollTo(0, document.body.scrollHeight)
+			if (window.autofollow) {
+				window.autofollow_ignore = true;
+				window.scrollTo(0, document.body.scrollHeight);
+			}
 		};
 	{{ else }} 
 		$.get("/{{ .Repo.Slug }}/commit/{{ .Commit.Hash }}/build/{{ .Build.Slug }}/out.txt", function( data ) {
@@ -132,4 +157,4 @@
 		});
 	{{ end }}
 	</script>
-{{ end }}
\ No newline at end of file
+{{ end }}