diff --git a/Changes b/Changes
index 632d17ab..acce2d2a 100644
--- a/Changes
+++ b/Changes
@@ -1,9 +1,13 @@
-2.035005 - 
+2.035005 - 2017-04-29
 
   [NEW FEATURES]
 
   * New report for Port VLAN Mismatches (M. Bernstein)
 
+  [BUG FIXES]
+
+  * Do not attempt to UTF-8 decode OUI retrieved by curl/wget
+
 2.035004 - 2017-04-25
 
   [BUG FIXES]
diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy
index 7085ef5b..bb34967e 100755
--- a/bin/netdisco-deploy
+++ b/bin/netdisco-deploy
@@ -245,7 +245,7 @@ sub deploy_oui {
 sub shorten {
     my $manuf = shift;
 
-    $manuf = decode "utf8", $manuf, Encode::FB_CROAK;
+    $manuf = decode("utf8", $manuf, Encode::FB_CROAK) unless @ARGV;
     $manuf = " " . $manuf . " ";
 
     # Remove any punctuation