diff --git a/debug.php b/debug.php
new file mode 100644
index 00000000..84416cff
--- /dev/null
+++ b/debug.php
@@ -0,0 +1,19 @@
+<?php
+    require "scripts/pi-hole/php/header.php";
+?>
+<!-- Title -->
+<div class="page-header">
+    <h1>Generate debug log</h1>
+</div>
+
+<p><input type="checkbox" id="upload" checked> Upload debug log and provide token once finished</p>
+<p>Once you click this button a debug log will be generated and can automatically be uploaded if we detect a working internet connection.</p>
+<button class="btn btn-lg btn-primary btn-block" id="debugBtn">Generate debug log</button>
+<pre id="output" style="width: 100%; height: 100%;" hidden="true"></pre>
+
+<?php
+    require "scripts/pi-hole/php/footer.php";
+?>
+
+
+<script src="scripts/pi-hole/js/debug.js"></script>
diff --git a/scripts/pi-hole/js/debug.js b/scripts/pi-hole/js/debug.js
new file mode 100644
index 00000000..c0db2ce0
--- /dev/null
+++ b/scripts/pi-hole/js/debug.js
@@ -0,0 +1,65 @@
+// Credit: http://stackoverflow.com/a/10642418/2087442
+function httpGet(ta,theUrl)
+{
+    var xmlhttp;
+    if (window.XMLHttpRequest)
+    {
+    // code for IE7+
+        xmlhttp = new XMLHttpRequest();
+    }
+    else
+    {
+    // code for IE6, IE5
+        xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+    }
+    xmlhttp.onreadystatechange=function()
+    {
+        if (xmlhttp.readyState === 4 && xmlhttp.status === 200)
+        {
+            ta.show();
+            ta.empty();
+            ta.append(xmlhttp.responseText);
+        }
+    };
+    xmlhttp.open("GET", theUrl, false);
+    xmlhttp.send();
+}
+
+function eventsource() {
+    var ta = $("#output");
+    var upload = $( "#upload" );
+    var checked = "";
+
+    if(upload.prop("checked"))
+    {
+      checked = "upload";
+    }
+
+    // IE does not support EventSource - load whole content at once
+    if (typeof EventSource !== "function") {
+        httpGet(ta,"/admin/scripts/pi-hole/php/debug.php?IE&"+checked);
+        return;
+    }
+
+    var host = window.location.host;
+    var source = new EventSource("/admin/scripts/pi-hole/php/debug.php?"+checked);
+
+    // Reset and show field
+    ta.empty();
+    ta.show();
+
+    source.addEventListener("message", function(e) {
+        ta.append(e.data);
+    }, false);
+
+    // Will be called when script has finished
+    source.addEventListener("error", function(e) {
+        source.close();
+    }, false);
+}
+
+$("#debugBtn").on("click", function(){
+    $("#debugBtn").attr("disabled", true);
+    $("#upload").attr("disabled", true);
+    eventsource();
+});
diff --git a/scripts/pi-hole/php/debug.php b/scripts/pi-hole/php/debug.php
new file mode 100644
index 00000000..93ae3166
--- /dev/null
+++ b/scripts/pi-hole/php/debug.php
@@ -0,0 +1,26 @@
+<?php
+ob_end_flush();
+ini_set("output_buffering", "0");
+ob_implicit_flush(true);
+header('Content-Type: text/event-stream');
+header('Cache-Control: no-cache');
+
+function echoEvent($datatext) {
+    if(!isset($_GET["IE"]))
+      echo "data: ".implode("\ndata: ", explode("\n", $datatext))."\n\n";
+    else
+      echo $datatext;
+}
+
+if(isset($_GET["upload"]))
+{
+	$proc = popen("sudo pihole -d -a -w", "r");
+}
+else
+{
+	$proc = popen("sudo pihole -d -w", "r");
+}
+while (!feof($proc)) {
+    echoEvent(fread($proc, 4096));
+}
+?>
diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php
index 85e1922a..c941ddac 100644
--- a/scripts/pi-hole/php/header.php
+++ b/scripts/pi-hole/php/header.php
@@ -419,7 +419,7 @@
                     <a href="#"><i class="fa fa-play"></i> <span id="enableLabel">Enable</span>&nbsp;&nbsp;&nbsp;<span id="flip-status-enable"></span></a>
                 </li>
                 <!-- Tools -->
-                <li class="treeview <?php if($scriptname === "gravity.php" || $scriptname === "queryads.php"){ ?>active<?php } ?>">
+                <li class="treeview <?php if($scriptname === "gravity.php" || $scriptname === "queryads.php" || $scriptname === "debug.php"){ ?>active<?php } ?>">
                   <a href="#">
                     <i class="fa fa-folder"></i> <span>Tools</span>
                     <span class="pull-right-container">
@@ -445,6 +445,12 @@
                             <i class="fa fa-list-ul"></i> <span>Tail pihole.log</span>
                         </a>
                     </li>
+                    <!-- Generate debug log -->
+                    <li<?php if($scriptname === "debug.php"){ ?> class="active"<?php } ?>>
+                        <a href="debug.php">
+                            <i class="fa fa-ambulance"></i> <span>Generate debug log</span>
+                        </a>
+                    </li>
                   </ul>
                 </li>
                 <!-- Settings -->