diff --git a/version.sh b/version.sh
index a58e2f98bbf9b41a28b22d77f2460a494e3eb40b..46a709f1c3d6635e6ab41ea9b6324a54cdc9d6e2 100755
--- a/version.sh
+++ b/version.sh
@@ -47,8 +47,8 @@ else
 	  DESCRIBE="${DESCRIBE/-dirty/}"
 	fi
 	# garbage-v3.0.6-24-g2c76283
-	NODE="${DESCRIBE##*-}"
-	DESCRIBE=${DESCRIBE%-*}
+	NODE="${DESCRIBE##*-g}"
+	DESCRIBE=${DESCRIBE%-g*}
 	# garbage-v3.0.6-24
 	DISTANCE="${DESCRIBE##*-}"
 	# garbage-v3.0.6