diff --git a/Netdisco/Changes b/Netdisco/Changes
index 1bbbc46e..98efa34a 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -11,6 +11,7 @@
   * Kwalitee fixes
   * Change default number of pollers to 10
   * Default netmap depth set to 8
+  * Add a "waiting" message to the netmap whilst the data loads
 
   [BUG FIXES]
 
diff --git a/Netdisco/share/views/ajax/device/netmap.tt b/Netdisco/share/views/ajax/device/netmap.tt
index 10a2b452..f75e91b2 100644
--- a/Netdisco/share/views/ajax/device/netmap.tt
+++ b/Netdisco/share/views/ajax/device/netmap.tt
@@ -115,6 +115,9 @@ $.getJSON('[% uri_for('/ajax/data/device/alldevicelinks') %]', function(data) {
         .attr("class", "node")
         .attr("transform", function(d) { return "rotate(" + (d.x - 90) + ")translate(" + d.y + ")"; });
 
+    // begin to draw...
+    d3.select("#nd_waiting").remove();
+
     node.append("circle")
         .attr("r", 4.5)
         // circle has class name of its device, so we can show/hide it
@@ -180,3 +183,5 @@ $.getJSON('[% uri_for('/ajax/data/device/alldevicelinks') %]', function(data) {
 
 // vim: ft=javascript
 </script>
+
+<div id="nd_waiting" class="span2 alert"><i class="icon-spinner icon-spin"></i> Waiting for results...</div>