diff --git a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
index 2c0efeca..a42ceae6 100644
--- a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
+++ b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
@@ -35,6 +35,7 @@ my %jobs = map { $_ => 1} qw/
     discover
     macsuck
     arpnip
+    nbtstat
 /;
 my %jobs_all = map {$_ => 1} qw/
     discoverall
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index 1990aab1..1f7d48d6 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -145,6 +145,8 @@
         <button class="btn btn-info btn-small nd_adminbutton" name="arpnip">Arpnip</button>
         <input type="hidden" data-form="macsuck" value="[% d.ip %]" name="device"/>
         <button class="btn btn-info btn-small nd_adminbutton" name="macsuck">Macsuck</button>
+        <input type="hidden" data-form="nbtstat" value="[% d.ip %]" name="device"/>
+        <button class="btn btn-info btn-small nd_adminbutton" name="nbtstat">NBTstat</button>
 
         <button class="btn btn-danger btn-small pull-right"
           data-toggle="modal" data-target="#nd_devdel" type="button">Delete</button>
diff --git a/Netdisco/share/views/layouts/main.tt b/Netdisco/share/views/layouts/main.tt
index e58f43bf..eb411654 100644
--- a/Netdisco/share/views/layouts/main.tt
+++ b/Netdisco/share/views/layouts/main.tt
@@ -107,7 +107,7 @@
           </li>
           <li>
             <form method="post" class="nd_inline-form" action="[% uri_for('/admin/nbtwalk') %]">
-              <button type="submit" class="btn btn-link nd_btn-link">Nbtstat All</button>
+              <button type="submit" class="btn btn-link nd_btn-link">NBTstat All</button>
             </form>
           </li>
           [% IF settings._admin_tasks.size %]