diff --git a/Makefile b/Makefile
index 5b0a0b6..49305a7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,19 @@ CPPFLAGS     += -DETICS
 OPTIMIZATION ?= 3
 
 CUDAINC       = -I$(CUDAHOME)/include -I$(CUDAHOME)/samples/common/inc/
-CUDALIB       = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt
+CUDALIB       = -L$(CUDAHOME)/lib64 -lcudart -lcudadevrt -lcuda
 
-GRAPEHOME     = ../grapite
-GRAPELIB      = -L$(GRAPEHOME) -lgrapite
-yebisu: GRAPEHOME = ../yebisu
-yebisu: GRAPELIB  = -L$(GRAPEHOME) -lyebisug6
-GRAPEINC      = -I$(GRAPEHOME)
+default grapite: GRAPEHOME = ../grapite
+default grapite: GRAPELIB  = -L$(GRAPEHOME) -lgrapite -fopenmp
+yebisu:  GRAPEHOME = ../yebisu
+yebisu:  GRAPELIB  = -L$(GRAPEHOME) -lyebisug6
+sapporo: GRAPEHOME = ../sapporo2/lib
+sapporo: GRAPELIB  = -L$(GRAPEHOME) -lsapporo -fopenmp
+         GRAPEINC  = -I$(GRAPEHOME)
 
 CXXFLAGS     += -O$(OPTIMIZATION)
 INC           = $(GRAPEINC) $(CUDAINC)
-LIB           = $(GRAPELIB) $(CUDALIB) -lm
+LIB           = $(GRAPELIB) $(CUDALIB) -lm -fopenmp
 MPICXX       ?= mpic++
 EXECUTABLE   ?= phigrape
 
@@ -24,8 +26,8 @@ LIB          += -lhdf5 -lz -ldl
 default:
 	$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(INC) black_holes.cpp external.cpp io.cpp config.cpp phigrape.cpp -o $(EXECUTABLE) $(LIB)
 
-yebisu: CPPFLAGS := $(filter-out -DETICS, $(CPPFLAGS))
-yebisu: default
+yebisu sapporo: CPPFLAGS := $(filter-out -DETICS, $(CPPFLAGS))
+yebisu sapporo grapite: default
 
 clean:
-	rm -f *.o phigrape
+	rm -f CUDA *.o phigrape