diff --git a/Documentation/GEN-DOC-VERSION b/Documentation/GEN-DOC-VERSION
index 0d6e815..973bfa8 100755
--- a/Documentation/GEN-DOC-VERSION
+++ b/Documentation/GEN-DOC-VERSION
@@ -14,6 +14,6 @@
 	;;
 
 v*)
-	echo ${V#v}
+	echo "$V" | perl -lne 'print $1 if /^v(\d+\.\d+(?:\.\d+)?)/'
 	;;
 esac
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 673c0a7..18a92b4 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -52,7 +52,7 @@
 	@-rm -rf $(LOCAL_ROOT)
 	@echo "Checking out current $(VERSION)"
 	@if ! $(SVN) checkout $(PUB_DIR) $(LOCAL_ROOT) 2>/dev/null ; then \
-		p=$$(git describe HEAD^ | perl -lne 'print $$1 if /^v(\d+\.\d+\.\d+)/') && \
+		p=$$(git describe HEAD^ | perl -lne 'print $$1 if /^v(\d+\.\d+(?:\.\d+)?)/') && \
 		echo "Copying $$p to $(VERSION) ..." && \
 		$(SVN) cp -m "Create $(VERSION) documentation" $(PUB_ROOT)/$$p $(PUB_DIR) && \
 		$(SVN) checkout $(PUB_DIR) $(LOCAL_ROOT) ; \