diff --git a/Netdisco/Changes b/Netdisco/Changes
index a2eb38cc..c7ce0d9c 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -15,6 +15,7 @@
   * [#191] Fix error when stopping stopped web daemon
   * [#174] LDAP users should not be able to change password
   * [#182] SSID and PoE showing in wrong Device Port columns
+  * [#181] AP Client Count report was broken
 
 2.030000 - 2015-01-08
 
diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST
index e64b6c38..74d2f25d 100644
--- a/Netdisco/MANIFEST
+++ b/Netdisco/MANIFEST
@@ -326,6 +326,8 @@ share/views/ajax/device/ports.tt
 share/views/ajax/device/ports_csv.tt
 share/views/ajax/report/apchanneldist.tt
 share/views/ajax/report/apchanneldist_csv.tt
+share/views/ajax/report/apclients.tt
+share/views/ajax/report/apclients_csv.tt
 share/views/ajax/report/apradiochannelpower.tt
 share/views/ajax/report/apradiochannelpower_csv.tt
 share/views/ajax/report/deviceaddrnodns.tt
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm
index 8093e42e..137225ed 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm
@@ -195,6 +195,20 @@ __PACKAGE__->might_have(
     }
 );
 
+=head2 ssid
+
+Returns a row from the C<device_port_ssid> table if one refers to this
+device port.
+
+=cut
+
+__PACKAGE__->might_have(
+    ssid => 'App::Netdisco::DB::Result::DevicePortSsid',
+    {   'foreign.ip'   => 'self.ip',
+        'foreign.port' => 'self.port',
+    }
+);
+
 =head2 wireless
 
 Returns a row from the C<device_port_wireless> table if one refers to this
diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm
index ce54c924..63e23856 100644
--- a/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm
+++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePortSsid.pm
@@ -47,5 +47,21 @@ __PACKAGE__->belongs_to( port => 'App::Netdisco::DB::Result::DevicePort', {
     'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port',
 });
 
+=head2 nodes
+
+Returns the set of Nodes whose MAC addresses are associated with this Device
+Port SSID.
+
+=cut
+
+__PACKAGE__->has_many( nodes => 'App::Netdisco::DB::Result::Node',
+  {
+    'foreign.switch' => 'self.ip',
+    'foreign.port' => 'self.port',
+  },
+  { join_type => 'LEFT',
+    cascade_copy => 0, cascade_update => 0, cascade_delete => 0 },
+);
+
 # You can replace this text with custom code or comments, and it will be preserved on regeneration
 1;
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
index a11113f7..6bd929e7 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/ApClients.pm
@@ -18,15 +18,16 @@ get '/ajax/content/report/apclients' => require_login sub {
     my @results = schema('netdisco')->resultset('Device')->search(
         { 'nodes.time_last' => { '>=', \'me.last_macsuck' } },
         {   select => [ 'ip', 'dns', 'name', 'model', 'location' ],
-            join       => { 'ports' => { 'wireless' => 'nodes' } },
+            join       => { 'ports' => { 'ssid' => 'nodes' } },
             '+columns' => [
                 { 'port'        => 'ports.port' },
                 { 'description' => 'ports.name' },
+                { 'ssid'        => 'ssid.ssid' },
                 { 'mac_count'   => { count => 'nodes.mac' } },
             ],
             group_by => [
                 'me.ip',       'me.dns',     'me.name',     'me.model',
-                'me.location', 'ports.port', 'ports.descr', 'ports.name'
+                'me.location', 'ports.port', 'ports.descr', 'ports.name', 'ssid.ssid',
             ],
             order_by => { -desc => [qw/count/] },
         }
@@ -36,12 +37,12 @@ get '/ajax/content/report/apclients' => require_login sub {
 
     if ( request->is_ajax ) {
         my $json = to_json( \@results );
-        template 'ajax/report/portmultinodes.tt', { results => $json },
+        template 'ajax/report/apclients.tt', { results => $json },
             { layout => undef };
     }
     else {
         header( 'Content-Type' => 'text/comma-separated-values' );
-        template 'ajax/report/portmultinodes_csv.tt',
+        template 'ajax/report/apclients_csv.tt',
             { results => \@results },
             { layout  => undef };
     }
diff --git a/Netdisco/share/views/ajax/report/apclients.tt b/Netdisco/share/views/ajax/report/apclients.tt
new file mode 100644
index 00000000..ca64c4f8
--- /dev/null
+++ b/Netdisco/share/views/ajax/report/apclients.tt
@@ -0,0 +1,63 @@
+<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
+  <thead>
+    <tr>
+      <th>Device</th>
+      <th>Model</th>
+      <th>Location</th>
+      <th>Port</th>
+      <th>SSID</th>
+      <th>Node Count</th>
+    </tr>
+  </thead>
+</table>
+
+<script type="text/javascript">
+$(document).ready(function() {
+  var table = $('#data-table').dataTable({
+    "deferRender": true,
+    "order": [[ 5, "desc" ]],
+    "data": [% results %],
+    "columns": [
+      {
+        "data": 'ip',
+        "render": function(data, type, row, meta) {
+          return type === 'display' ?
+            '<a href="[% uri_for('/device') %]?tab=details&q=' + encodeURIComponent(row.ip) + '">'
+            + he.encode(row.dns || row.name || row.ip) + '</a>' :
+          data;
+        }
+      }, {
+        "data": 'model',
+        "render": function(data, type, row, meta) {
+          return he.encode(data || '');
+        }
+      }, {
+        "data": 'location',
+        "render": function(data, type, row, meta) {
+          return he.encode(data || '');
+        }
+      }, {
+        "data": 'port',
+        "type": 'portsort',
+        "render": function(data, type, row, meta) {
+          return type === 'display' ?
+            '<a href="[% device_ports %]&q=' + encodeURIComponent(row.ip) + '&f=' + encodeURIComponent(data) + '&c_nodes=on">' + he.encode(data) + '</a>' :
+            data;
+        }
+      }, {
+        "data": 'ssid',
+        "render": function(data, type, row, meta) {
+          return he.encode(data || '');
+        }
+      }, {
+        "data": 'mac_count',
+        "searchable": false,
+        "render": function(data, type, row, meta) {
+          return data.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+        }
+      }
+    ],
+[% INCLUDE 'ajax/datatabledefaults.tt' -%]
+  });
+});
+</script>
diff --git a/Netdisco/share/views/ajax/report/apclients_csv.tt b/Netdisco/share/views/ajax/report/apclients_csv.tt
new file mode 100644
index 00000000..145fc44f
--- /dev/null
+++ b/Netdisco/share/views/ajax/report/apclients_csv.tt
@@ -0,0 +1,14 @@
+[% USE CSV -%]
+[% CSV.dump([ 'Device' 'Model' 'Location' 'Port' 'SSID' 'Node Count' ]) %]
+
+[% FOREACH row IN results %]
+  [% mylist = [] %]
+  [% mylist.push(row.dns || row.name || row.ip) %]
+  [% mylist.push(row.model) %]
+  [% mylist.push(row.location) %]
+  [% mylist.push(row.port) %]
+  [% mylist.push(row.ssid) %]
+  [% mylist.push(row.mac_count) %]
+  [% CSV.dump(mylist) %]
+
+[% END %]