diff --git a/make/program b/make/program
index c9eb4bf862..ed8f0b58bd 100644
--- a/make/program
+++ b/make/program
@@ -69,7 +69,7 @@ endif
 %.hpp : %.stan bin/stanc$(EXE)
 	@echo ''
 	@echo '--- Translating Stan model to C++ code ---'
-	$(WINE) bin/stanc$(EXE) $(STANCFLAGS) --o=$(subst  \,/,$@) $(subst  \,/,$<)
+	$(WINE) bin/stanc$(EXE) $(STANCFLAGS) --o="$(subst  \,/,$@)" "$(subst  \,/,$<)"
 
 %.d: %.hpp
 
@@ -80,12 +80,12 @@ endif
 %.o : %.hpp $(USER_HEADER)
 	@echo ''
 	@echo '--- Compiling C++ code ---'
-	$(COMPILE.cpp) $(CXXFLAGS_PROGRAM) -x c++ -o $(subst  \,/,$*).o $(subst \,/,$<)
+	$(COMPILE.cpp) $(CXXFLAGS_PROGRAM) -x c++ -o "$(subst \,/,$*).o" "$(subst \,/,$<)"
 
 %$(EXE) : %.o $(CMDSTAN_MAIN_O) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(PRECOMPILED_MODEL_HEADER)
 	@echo ''
 	@echo '--- Linking model ---'
-	$(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION))
+	$(LINK.cpp) "$(subst \,/,$*.o)" $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) -o "$(subst \,/,$@)"
 
 ifeq ($(OS),Windows_NT)
 ifneq (,$(TBB_TARGETS))