--- Source/kwsys/SystemInformation.cxx
+++ Source/kwsys/SystemInformation.cxx
@@ -152,7 +152,7 @@
 
 public:
 #define VENDOR_STRING_LENGTH    (12 + 1)
-#define CHIPNAME_STRING_LENGTH    (48 + 1)
+#define CHIPNAME_STRING_LENGTH    (70 + 1)
 #define SERIALNUMBER_STRING_LENGTH  (29 + 1)
 
   typedef struct tagID
--- Utilities/cmtar/encode.c
+++ Utilities/cmtar/encode.c
@@ -32,7 +32,10 @@
   int i, sum = 0;
 
   if (t->options & TAR_GNU)
-    strncpy(t->th_buf.magic, "ustar  ", 8);
+  {
+    strncpy(t->th_buf.version, "  ", TVERSLEN);
+    strncpy(t->th_buf.magic, "ustar", TMAGLEN);
+  }
   else
   {
     strncpy(t->th_buf.version, TVERSION, TVERSLEN);