2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ba24748..b8c0763 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ RMDIR = echo -e "  RM\t$(1)" && rmdir --ignore-fail-on-non-empty $(1) 2> /dev/nu
 GZIP = gzip --best -c
 
 # Git related
-GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_STRING)/ $(VERSION_STRING) | \
+GIT_ARCHIVE = git archive --prefix=netsniff-ng-$(VERSION_STRING)/ v$(VERSION_STRING) | \
 	      $(1) > ../netsniff-ng-$(VERSION_STRING).tar.$(2)
 GIT_TAG = git tag -a $(VERSION_STRING) -s -m "tools: $(VERSION_STRING) release"
 GIT_LOG = git shortlog -n --not $(shell git describe --always --abbrev=0 --tags)
diff --git a/configure b/configure
index ccd84f4..5e24313 100755
--- a/configure
+++ b/configure
@@ -507,7 +507,7 @@ EOF
 
 gen_config_hdr()
 {
-	local _version="`git describe --always`"
+	local _version=""
 	local _have_libpcap=""
 	local _have_libgeoip=""
 	local _have_libz=""
@@ -515,6 +515,13 @@ gen_config_hdr()
 
 	echo "[*] Generating config.h ... "
 
+	git rev-parse > /dev/null 2>&1
+	if [ "$?" == "0" ] ; then
+		_version="`git describe --always`"
+	else
+		_version="(none)"
+	fi
+
 	if [ "$HAVE_LIBPCAP" == "1" ] ; then
 		_have_libpcap="#define HAVE_TCPDUMP_LIKE_FILTER 1"
 	fi