diff --git a/Netdisco/Changes b/Netdisco/Changes
index b9213990..8e5d83d9 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.028008
+
+  [BUG FIXES]
+
+  * Encode NetBIOS name, domain, user as UTF-8
+
 2.028007 - 2014-07-21
 
   [ENHANCEMENTS]
diff --git a/Netdisco/lib/App/Netdisco/Core/Nbtstat.pm b/Netdisco/lib/App/Netdisco/Core/Nbtstat.pm
index 568a4189..2a70a9fc 100644
--- a/Netdisco/lib/App/Netdisco/Core/Nbtstat.pm
+++ b/Netdisco/lib/App/Netdisco/Core/Nbtstat.pm
@@ -6,6 +6,7 @@ use Dancer::Plugin::DBIC 'schema';
 use App::Netdisco::Util::Node 'check_mac';
 use NetAddr::IP::Lite ':lower';
 use App::Netdisco::AnyEvent::Nbtstat;
+use Encode;
 
 use base 'Exporter';
 our @EXPORT = ();
@@ -131,10 +132,10 @@ sub _filter_nbname {
 
         $hash_ref->{'ip'} = $ip;
         $hash_ref->{'mac'}    = $mac;
-        $hash_ref->{'nbname'} = $nbname;
-        $hash_ref->{'domain'} = $domain;
+        $hash_ref->{'nbname'} = Encode::decode('UTF-8', $nbname);
+        $hash_ref->{'domain'} = Encode::decode('UTF-8', $domain);
         $hash_ref->{'server'} = $server;
-        $hash_ref->{'nbuser'} = $nbuser;
+        $hash_ref->{'nbuser'} = Encode::decode('UTF-8', $nbuser);
         
     return;
 }