diff --git a/build_tools/make_version b/build_tools/make_version
index e90932e65dce14ba750318e3a7b70d67e9d5fbb3..d81325f78879eacb79bfd159d01c5916dc22d991 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -7,6 +7,7 @@ elif [ -d .svn ]; then
     BRANCH=0
     TEAM=0
     TAG=0
+    FEATURE=0
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
@@ -40,6 +41,9 @@ elif [ -d .svn ]; then
             else
                 RESULT="${RESULT}-${PART}"
             fi
+            if [ ${FEATURE} != 0 ] ; then
+                RESULT="${RESULT}-${FEATURE_NAME}"
+            fi
             break
         fi
 
@@ -52,6 +56,12 @@ elif [ -d .svn ]; then
             continue
         fi
 
+        if [ "${PART}" = "certified" ] ; then
+            FEATURE=1
+            FEATURE_NAME="cert"
+            continue
+        fi
+
         if [ "${PART}" = "branches" ] ; then
             BRANCH=1
             RESULT="branch"