diff --git a/include/sys/utsname.h b/include/sys/utsname.h
index abe7bd7d667..b152dc3ea7e 100644
--- a/include/sys/utsname.h
+++ b/include/sys/utsname.h
@@ -46,7 +46,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define SYS_NAMELEN      16
+#define SYS_NAMELEN      21
 #define VERSION_NAMELEN  41
 
 /****************************************************************************
diff --git a/tools/version.sh b/tools/version.sh
index 8c47bd85c42..b255edc5d13 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -76,7 +76,7 @@ if [ -z ${VERSION} ] ; then
   # If the VERSION does not match X.Y.Z, retrieve version from the tag
 
   if [[ ! ${VERSION} =~ ([0-9]+)\.([0-9]+)\.([0-9]+) ]] ; then
-    VERSION=`git -C ${WD} tag --sort=v:refname | grep -E "nuttx-[0-9]+\.[0-9]+\.[0-9]+" | tail -1 | cut -d'-' -f2`
+    VERSION=`git -C ${WD} tag --sort=v:refname | grep -E "nuttx-[0-9]+\.[0-9]+\.[0-9]+" | tail -1 | cut -d'-' -f2-`
   fi
 
 fi