diff --git a/lib/libes/makefile b/lib/libes/makefile
index a6d2bf8..d8a204a 100644
--- a/lib/libes/makefile
+++ b/lib/libes/makefile
@@ -33,7 +33,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/libfnd/makefile b/lib/libfnd/makefile
index 73af097..0ec7dcf 100644
--- a/lib/libfnd/makefile
+++ b/lib/libfnd/makefile
@@ -33,7 +33,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/libhac-hb/makefile b/lib/libhac-hb/makefile
index c91b3df..f84b880 100644
--- a/lib/libhac-hb/makefile
+++ b/lib/libhac-hb/makefile
@@ -33,7 +33,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/libhac/makefile b/lib/libhac/makefile
index a6d2bf8..d8a204a 100644
--- a/lib/libhac/makefile
+++ b/lib/libhac/makefile
@@ -33,7 +33,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/liblz4/makefile b/lib/liblz4/makefile
index b6fc4ef..ff57976 100644
--- a/lib/liblz4/makefile
+++ b/lib/liblz4/makefile
@@ -32,7 +32,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/libpki/makefile b/lib/libpki/makefile
index da68d0b..045b0ab 100644
--- a/lib/libpki/makefile
+++ b/lib/libpki/makefile
@@ -32,7 +32,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/lib/libpolarssl/makefile b/lib/libpolarssl/makefile
index 2c2becf..95b8e7c 100644
--- a/lib/libpolarssl/makefile
+++ b/lib/libpolarssl/makefile
@@ -32,7 +32,7 @@ else
 endif
 
 # Output
-OUTPUT = $(shell basename $(CURDIR)).a
+OUTPUT = $(shell basename "$(CURDIR)").a
 
 main: build
 
diff --git a/makefile b/makefile
index ee116a5..2897e51 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-PROJECT_DIR = $(CURDIR)
+PROJECT_DIR = "$(CURDIR)"
 LIB_DIR = $(PROJECT_DIR)/lib
 PROGRAM_DIR = $(PROJECT_DIR)/programs
 BIN_DIR = $(PROJECT_DIR)/bin