diff --git a/generate-version.sh b/generate-version.sh
index cfb85059..b539ce42 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -22,14 +22,16 @@ else
     new_version="${default_version}"
 fi
 
-major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1/')
-minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\2/')
-patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/')
+major=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\1/')
+minor=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\2/')
+patch=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\3/')
+extra=$(echo "${new_version}" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)(-([0-9]+-g[a-z0-9]+) .*)?/\5/')
 
 new_version="#define FOOT_VERSION \"${new_version}\"
 #define FOOT_MAJOR ${major}
 #define FOOT_MINOR ${minor}
-#define FOOT_PATCH ${patch}"
+#define FOOT_PATCH ${patch}
+#define FOOT_EXTRA \"${extra}\""
 
 if [ -f "${out_file}" ]; then
     old_version=$(cat "${out_file}")