diff --git a/nxt/system.py b/nxt/system.py
index fe699e0..6f2733a 100644
--- a/nxt/system.py
+++ b/nxt/system.py
@@ -217,7 +217,7 @@ def get_device_info(opcode):
 
 def _parse_get_device_info(tgram):
     tgram.check_status()
-    name = tgram.parse_string(15).decode('windows-1252').split('\0')[0]
+    name = tgram.parse_string(15).decode('utf-8').split('\0')[0]
     a0 = tgram.parse_u8()
     a1 = tgram.parse_u8()
     a2 = tgram.parse_u8()
diff --git a/nxt/telegram.py b/nxt/telegram.py
index fd8604f..c0ef0d5 100644
--- a/nxt/telegram.py
+++ b/nxt/telegram.py
@@ -68,8 +68,7 @@ def add_string(self, n_bytes, v):
         self.pkt.write(pack('%ds' % n_bytes, v.encode('windows-1252')))
 
     def add_filename(self, fname):
-        #self.pkt.write(pack('20s', fname))
-        self.pkt.write(pack('20s', fname.encode('windows-1252')))
+        self.pkt.write(pack('20s', fname.encode('utf-8')))
 
     def add_s8(self, v):
         self.pkt.write(pack('<b', v))
diff --git a/scripts/nxtfilemgr b/scripts/nxtfilemgr
index d0d5b1b..4df297e 100755
--- a/scripts/nxtfilemgr
+++ b/scripts/nxtfilemgr
@@ -151,7 +151,7 @@ class NXTListing(Gtk.ListStore):
     def populate(self, brick, pattern):
         f = FileFinder(brick, pattern)
         for (fname_b, size) in f:
-            fname = fname_b.decode('windows-1252')
+            fname = fname_b.decode('utf-8')
             self.append((fname, str(size)))