diff --git a/src/STUBS/Makefile b/src/STUBS/Makefile
index c9d4fb89d..a19434154 100644
--- a/src/STUBS/Makefile
+++ b/src/STUBS/Makefile
@@ -1,44 +1,44 @@
 # Makefile for MPI stubs library
 
 # Syntax:
 #   make                 # build lib as libmpi_stubs.a
 #   make clean           # remove *.o and lib files
 
 # edit System-specific settings as needed for your platform
 
 SHELL = /bin/sh
 .IGNORE:
 
 # Files
 
 SRC =		mpi.c
 INC =		mpi.h
 
 # Definitions
 
 EXE =		libmpi_stubs.a
 OBJ = 		$(SRC:.c=.o)
 
 # System-specific settings
 
-CC =		gcc
-CCFLAGS =	
+CC =		g++
+CCFLAGS =	-O -fPIC
 ARCHIVE =	ar
 ARCHFLAG =	rs
 
 # Targets
 
 lib:	$(OBJ)
 	$(ARCHIVE) $(ARCHFLAG) $(EXE) $(OBJ)
 
 clean:
 	rm -f *.o libmpi_stubs.a
 
 # Compilation rules
 
 .c.o:
 	$(CC) $(CCFLAGS) -c $<
 
 # Individual dependencies
 
 $(OBJ):	$(INC)