diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
index 06880c44..b5869e7c 100644
--- a/pelican/tools/templates/Makefile.in
+++ b/pelican/tools/templates/Makefile.in
@@ -61,63 +61,63 @@ help:
 	@echo '                                                                          '
 
 html:
-	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$$(PELICAN) "$$(INPUTDIR)" -o "$$(OUTPUTDIR)" -s "$$(CONFFILE)" $$(PELICANOPTS)
 
 clean:
-	[ ! -d $$(OUTPUTDIR) ] || rm -rf $$(OUTPUTDIR)
+	[ ! -d "$$(OUTPUTDIR)" ] || rm -rf "$$(OUTPUTDIR)"
 
 regenerate:
-	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
+	$$(PELICAN) -r "$$(INPUTDIR)" -o "$$(OUTPUTDIR)" -s "$$(CONFFILE)" $$(PELICANOPTS)
 
 serve:
 ifdef PORT
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server $$(PORT)
+	cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server $$(PORT)
 else
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
+	cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server
 endif
 
 serve-global:
 ifdef SERVER
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 $$(SERVER)
+	cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server 80 $$(SERVER)
 else
-	cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0
+	cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server 80 0.0.0.0
 endif
 
 
 devserver:
 ifdef PORT
-	$$(BASEDIR)/develop_server.sh restart $$(PORT)
+	"$$(BASEDIR)/develop_server.sh" restart $$(PORT)
 else
-	$$(BASEDIR)/develop_server.sh restart
+	"$$(BASEDIR)/develop_server.sh" restart
 endif
 
 stopserver:
-	$(BASEDIR)/develop_server.sh stop
+	"$$(BASEDIR)/develop_server.sh" stop
 	@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
 
 publish:
-	$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(PUBLISHCONF) $$(PELICANOPTS)
+	$$(PELICAN) "$$(INPUTDIR)" -o "$$(OUTPUTDIR)" -s "$$(PUBLISHCONF)" $$(PELICANOPTS)
 
 ssh_upload: publish
-	scp -P $$(SSH_PORT) -r $$(OUTPUTDIR)/* $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
+	scp -P $$(SSH_PORT) -r "$$(OUTPUTDIR)/*" $$(SSH_USER)@$$(SSH_HOST):$$(SSH_TARGET_DIR)
 
 rsync_upload: publish
-	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
+	rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete "$(OUTPUTDIR)/" $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
 
 dropbox_upload: publish
-	cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR)
+	cp -r "$$(OUTPUTDIR)/*" "$$(DROPBOX_DIR)"
 
 ftp_upload: publish
-	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R $$(OUTPUTDIR) $$(FTP_TARGET_DIR) ; quit"
+	lftp ftp://$$(FTP_USER)@$$(FTP_HOST) -e "mirror -R '$$(OUTPUTDIR)' '$$(FTP_TARGET_DIR)' ; quit"
 
 s3_upload: publish
-	aws s3 sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl public-read --delete
+	aws s3 sync "$(OUTPUTDIR)/" s3://$(S3_BUCKET) --acl public-read --delete
 
 cf_upload: publish
-	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
+	cd "$(OUTPUTDIR)" && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
 
 github: publish
-	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR)
+	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) "$$(OUTPUTDIR)"
 	git push origin $(GITHUB_PAGES_BRANCH)
 
 .PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
index e345fefd..6a1b3319 100755
--- a/pelican/tools/templates/develop_server.sh.in
+++ b/pelican/tools/templates/develop_server.sh.in
@@ -31,7 +31,7 @@ function alive() {
 }
 
 function shut_down(){
-  PID=$$(cat $$SRV_PID)
+  PID=$$(cat "$$SRV_PID")
   if [[ $$? -eq 0 ]]; then
     if alive $PID; then
       echo "Stopping HTTP server"
@@ -39,12 +39,12 @@ function shut_down(){
     else
       echo "Stale PID, deleting"
     fi
-    rm $$SRV_PID
+    rm "$$SRV_PID"
   else
     echo "HTTP server PIDFile not found"
   fi
 
-  PID=$$(cat $$PELICAN_PID)
+  PID=$$(cat "$$PELICAN_PID")
   if [[ $$? -eq 0 ]]; then
     if alive $$PID; then
       echo "Killing Pelican"
@@ -52,7 +52,7 @@ function shut_down(){
     else
       echo "Stale PID, deleting"
     fi
-    rm $$PELICAN_PID
+    rm "$$PELICAN_PID"
   else
     echo "Pelican PIDFile not found"
   fi
@@ -62,14 +62,14 @@ function start_up(){
   local port=$$1
   echo "Starting up Pelican and HTTP server"
   shift
-  $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
+  "$$PELICAN" --debug --autoreload -r "$$INPUTDIR" -o "$$OUTPUTDIR" -s "$$CONFFILE" $$PELICANOPTS &
   pelican_pid=$$!
-  echo $$pelican_pid > $$PELICAN_PID
-  mkdir -p $$OUTPUTDIR && cd $$OUTPUTDIR
+  echo $$pelican_pid > "$$PELICAN_PID"
+  mkdir -p "$$OUTPUTDIR" && cd "$$OUTPUTDIR"
   $PY -m pelican.server $$port &
   srv_pid=$$!
-  echo $$srv_pid > $$SRV_PID
-  cd $$BASEDIR
+  echo $$srv_pid > "$$SRV_PID"
+  cd "$$BASEDIR"
   sleep 1
   if ! alive $$pelican_pid ; then
     echo "Pelican didn't start. Is the Pelican package installed?"