diff --git a/samples/vboxwrapper/BuildMacVboxWrapper.sh b/samples/vboxwrapper/BuildMacVboxWrapper.sh
index bffeca2467..129cd0ba94 100644
--- a/samples/vboxwrapper/BuildMacVboxWrapper.sh
+++ b/samples/vboxwrapper/BuildMacVboxWrapper.sh
@@ -23,6 +23,7 @@
 # by Charlie Fenton 2/15/10
 # Updated 11/16/11 for XCode 4.1 and OS 10.7 
 # Updated 7/12/12 for Xcode 4.3 and later which are not at a fixed address
+# Updated 4/14/15 for compatibility with Xcode 6
 #
 ## This script requires OS 10.6 or later
 #
@@ -68,10 +69,7 @@ TOOLSPATH2=${ARPATH%/ar}
 
 export PATH="${TOOLSPATH1}":"${TOOLSPATH2}":/usr/local/bin:$PATH
 
-## There is an apparent bug in MacOSX10.8.sdk which causes our 
-## floppyio compilation to fail, so use MacOSX10.7.sdk for now
-##SDKPATH=`xcodebuild -version -sdk macosx Path`
-SDKPATH=`xcodebuild -version -sdk macosx10.7 Path`
+SDKPATH=`xcodebuild -version -sdk macosx Path`
 
 rm -fR i386 x86_64
 
diff --git a/samples/vboxwrapper/Makefile_mac b/samples/vboxwrapper/Makefile_mac
index 1e0d943241..43b5c7f0e1 100644
--- a/samples/vboxwrapper/Makefile_mac
+++ b/samples/vboxwrapper/Makefile_mac
@@ -3,6 +3,7 @@
 # It should not be used by itself without the script.
 # Updated 7/10/12 for Xcode 4.3 and later which are not at a fixed address
 # Updated 4/10/15 to remove deleted files vboxlog.cpp and vboxlog.h
+# Updated 4/14/15 for compatibility with Xcode 6
 
 
 BOINC_DIR = ../..
@@ -39,25 +40,25 @@ clean:
 	/bin/rm -f $(PROGS) $(OBJ)
 
 floppyio.o: floppyio.cpp
-	g++ $(CXXFLAGS) -c floppyio.cpp
+	$(CXX) $(CXXFLAGS) -c floppyio.cpp
 
 vbox_common.o: vbox_common.cpp
-	g++ $(CXXFLAGS) -c vbox_common.cpp
+	$(CXX) $(CXXFLAGS) -c vbox_common.cpp
 
 vbox_vboxmanage.o: vbox_vboxmanage.cpp
-	g++ $(CXXFLAGS) -c vbox_vboxmanage.cpp
+	$(CXX) $(CXXFLAGS) -c vbox_vboxmanage.cpp
 
 vboxcheckpoint.o: vboxcheckpoint.cpp
-	g++ $(CXXFLAGS) -c vboxcheckpoint.cpp
+	$(CXX) $(CXXFLAGS) -c vboxcheckpoint.cpp
 
 vboxjob.o: vboxjob.cpp
-	g++ $(CXXFLAGS) -c vboxjob.cpp
+	$(CXX) $(CXXFLAGS) -c vboxjob.cpp
 
 vboxlogging.o: vboxlogging.cpp
-	g++ $(CXXFLAGS) -c vboxlogging.cpp
+	$(CXX) $(CXXFLAGS) -c vboxlogging.cpp
 
 vboxwrapper.o: vboxwrapper.cpp
-	g++ $(CXXFLAGS) -c vboxwrapper.cpp
+	$(CXX) $(CXXFLAGS) -c vboxwrapper.cpp
 
-vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o libstdc++.a -pthread -lboinc_api -lboinc
+vboxwrapper: vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o $(BOINC_BUILD_DIR)/libboinc.a $(BOINC_BUILD_DIR)/libboinc_api.a
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vboxwrapper vboxwrapper.o vbox_common.o vbox_vboxmanage.o vboxcheckpoint.o vboxjob.o vboxlogging.o floppyio.o -pthread -lboinc_api -lboinc