diff --git a/configure.ac b/configure.ac
index 541ec999..5e4cf244 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,11 +9,10 @@ AC_CONFIG_HEADERS([config.h])
 AC_PROG_RANLIB
 
 AC_CHECK_PROGS([GIT], [git])
-if test -n "$GIT"; then
+if test -n "$GIT" && test -e ".git/index" ; then
   AC_DEFINE([CONFIG_USE_GIT_VERSION_STRING], 1, [Use the version string produced by running 'git describe --dirty'.])
 fi
-AM_CONDITIONAL([USE_GIT_VERSION], [test -n "$GIT"])
-
+AM_CONDITIONAL([USE_GIT_VERSION], [test -n "$GIT" && test -e ".git/index" ])
 
 # Derived from the Avahi configure.ac file
 # Specifying the OS type, defaulting to linux.