diff --git a/Makefile b/Makefile
index 813ce48..4b6fed1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ FUSE_LIBS := $(shell pkg-config --libs fuse)
 export FUSE_LIBS
 
 ifeq ($(USE_GIT_FUSE),yes)
-ADA_FUSE_SYSTEM := $(shell uname -sm)
+ADA_FUSE_SYSTEM := $(shell uname -sm | sed "s- -_-g")
 export ADA_FUSE_SYSTEM
 endif
 
@@ -28,7 +28,7 @@ build-test::	setup
 
 build:: tools
 
-tools:  tools/akt-configs.ads
+tools:  tools/akt-configs.ads setup
 	$(GNATMAKE) $(GPRFLAGS) -p -P$(NAME)_tools $(MAKE_ARGS)
 
 tools/akt-configs.ads:   Makefile.conf tools/akt-configs.gpb
@@ -59,6 +59,15 @@ install::
 
 endif
 
+ifeq ($(HAVE_FUSE),yes)
+ifeq ($(USE_GIT_FUSE),yes)
+
+setup:: ada-fuse/ada_fuse.gpr
+	cd ada-fuse && ./setup.py
+
+endif
+endif
+
 # Build and run the unit tests
 test:	build stamp-test-setup
 	bin/keystore_harness -l $(NAME): -t 120 -xml keystore-aunit.xml -config tests.properties