diff --git a/lib/cuda/Makefile.defaults b/lib/cuda/Makefile.defaults
index 3f39f7d606..ea0c53a349 100644
--- a/lib/cuda/Makefile.defaults
+++ b/lib/cuda/Makefile.defaults
@@ -3,7 +3,7 @@
 precision ?= 1
 
 #GPU architecture (compute capability): 13, 20, 21
-arch ?= 20
+arch ?= 21
 
 #Using cufft (should not be changed)
 cufft ?= 1
diff --git a/lib/cuda/Makefile.lammps b/lib/cuda/Makefile.lammps
index 172fbc91ec..711e827a65 100644
--- a/lib/cuda/Makefile.lammps
+++ b/lib/cuda/Makefile.lammps
@@ -1,6 +1,6 @@
 # Settings that the LAMMPS build will import when this package library is used
- CUDA_FLAGS = -I/usr/local/cuda/include -I../../lib/cuda -DUNIX  -DFFT_CUFFT -DCUDA_PRECISION=1 -DCUDA_ARCH=20 
- CUDA_USRLIB_CONDITIONAL = -L/usr/local/cuda/lib -L/usr/local/cuda/lib64 -lcufft
+CUDA_FLAGS := -I/usr/local/cuda/include -DUNIX  -DFFT_CUFFT -DCUDA_PRECISION=1 -DCUDA_ARCH=20 
+CUDA_USRLIB_CONDITIONAL := -L/usr/local/cuda/lib -L/usr/local/cuda/lib64 -lcufft
  
  user-cuda_SYSINC = ${CUDA_FLAGS}
  user-cuda_SYSLIB = -lcuda -lcudart -lrt
diff --git a/lib/gpu/Makefile.linux b/lib/gpu/Makefile.linux
index 1777187010..c8dd8350d1 100644
--- a/lib/gpu/Makefile.linux
+++ b/lib/gpu/Makefile.linux
@@ -20,8 +20,10 @@
 CUDA_HOME = /usr/local/cuda
 NVCC = nvcc
 
+# Tesla CUDA
+CUDA_ARCH = -arch=sm_21
 # newer CUDA
-CUDA_ARCH = -arch=sm_13
+#CUDA_ARCH = -arch=sm_13
 # older CUDA
 #CUDA_ARCH = -arch=sm_10 -DCUDA_PRE_THREE