diff --git a/lib/gpu/Makefile.lammps b/lib/gpu/Makefile.lammps
deleted file mode 100644
index 05651c5d76..0000000000
--- a/lib/gpu/Makefile.lammps
+++ /dev/null
@@ -1,5 +0,0 @@
-# Settings that the LAMMPS build will import when this package library is used
-
-gpu_SYSINC =
-gpu_SYSLIB = -lcudart -lcuda
-gpu_SYSPATH = -L/usr/local/cuda/lib64
diff --git a/lib/gpu/Makefile.lens b/lib/gpu/Makefile.lens
index a869ca46b8..e7b6ce0527 100644
--- a/lib/gpu/Makefile.lens
+++ b/lib/gpu/Makefile.lens
@@ -1,3 +1,8 @@
+
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = /sw/analysis-x64/cuda/3.2/centos5.5_binary/
 NVCC = nvcc
 
diff --git a/lib/gpu/Makefile.lincoln b/lib/gpu/Makefile.lincoln
index 1bf434cd4c..db66e08422 100644
--- a/lib/gpu/Makefile.lincoln
+++ b/lib/gpu/Makefile.lincoln
@@ -2,6 +2,10 @@
 # Makefile for NCSA's lincoln GPU cluster. Tested with "soft +cuda-2.3"
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = /usr/local/cuda-2.3
 NVCC = $(CUDA_HOME)/bin/nvcc
 
diff --git a/lib/gpu/Makefile.linux b/lib/gpu/Makefile.linux
index 33d103e3e5..5af5159be3 100644
--- a/lib/gpu/Makefile.linux
+++ b/lib/gpu/Makefile.linux
@@ -3,6 +3,10 @@
 #     - Change CUDA_ARCH for your GPU
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = /usr/local/cuda
 NVCC = nvcc
 
diff --git a/lib/gpu/Makefile.linux_opencl b/lib/gpu/Makefile.linux_opencl
index 5036cb25ea..8610917d93 100644
--- a/lib/gpu/Makefile.linux_opencl
+++ b/lib/gpu/Makefile.linux_opencl
@@ -2,6 +2,10 @@
 #  Generic Linux Makefile for OpenCL 
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 OCL_CPP = mpic++ -O3 -DMPI_GERYON -DUCL_NO_EXIT -DMPICH_IGNORE_CXX_SEEK
 OCL_LINK = -lOpenCL
 OCL_PREC = -D_SINGLE_SINGLE
diff --git a/lib/gpu/Makefile.longhorn b/lib/gpu/Makefile.longhorn
index 63b07d46ac..181c6a1886 100644
--- a/lib/gpu/Makefile.longhorn
+++ b/lib/gpu/Makefile.longhorn
@@ -3,6 +3,10 @@
 #     - Use "module load cuda".
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = $(TACC_CUDA_DIR)
 NVCC = nvcc
 CUDA_ARCH = -arch=sm_13
diff --git a/lib/gpu/Makefile.mac b/lib/gpu/Makefile.mac
index 7cd1d81898..96f739633e 100644
--- a/lib/gpu/Makefile.mac
+++ b/lib/gpu/Makefile.mac
@@ -4,6 +4,10 @@
 #     - Change CUDA_ARCH for your GPU
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = /usr/local/cuda
 NVCC = nvcc -m64
 
diff --git a/lib/gpu/Makefile.mac_opencl b/lib/gpu/Makefile.mac_opencl
index 6fb820655c..fa227ecd3e 100644
--- a/lib/gpu/Makefile.mac_opencl
+++ b/lib/gpu/Makefile.mac_opencl
@@ -2,6 +2,10 @@
 #  Generic Mac Makefile for OpenCL 
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 OCL_CPP = mpic++ -O3 -DMPI_GERYON -DUCL_NO_EXIT
 OCL_LINK = -framework OpenCL
 OCL_PREC = -D_SINGLE_SINGLE
diff --git a/lib/gpu/Makefile.serial b/lib/gpu/Makefile.serial
index 0fa824642c..809e99cc94 100644
--- a/lib/gpu/Makefile.serial
+++ b/lib/gpu/Makefile.serial
@@ -3,6 +3,10 @@
 #     - Change CUDA_ARCH for your GPU
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 CUDA_HOME = $(HOME)/cuda
 NVCC = nvcc
 
diff --git a/lib/gpu/Makefile.serial_opencl b/lib/gpu/Makefile.serial_opencl
index 4b6aa5b1fd..c6b7744028 100644
--- a/lib/gpu/Makefile.serial_opencl
+++ b/lib/gpu/Makefile.serial_opencl
@@ -1,6 +1,11 @@
 # /* ----------------------------------------------------------------------   
 #  Generic Makefile for OpenCL for use with MPI STUBS library
 # ------------------------------------------------------------------------- */
+
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
+
 OCL_HOME = $(HOME)/intelocl
 OCL_CPP = g++ -O3 -DMPI_GERYON -DUCL_NO_EXIT -I../../src/STUBS -I$(OCL_HOME)/include/
 # available tuned parameter sets: FERMI_OCL, CYPRESS_OCL
diff --git a/lib/gpu/Makefile.xk7 b/lib/gpu/Makefile.xk7
index f4bd399e08..1ee8e3225f 100644
--- a/lib/gpu/Makefile.xk7
+++ b/lib/gpu/Makefile.xk7
@@ -3,6 +3,9 @@
 #  - Uses PrgEnv-gnu
 # ------------------------------------------------------------------------- */
 
+# which file will be copied to Makefile.lammps
+
+EXTRAMAKE = Makefile.lammps.standard
 
 CUDA_HOME = $(CRAY_CUDATOOLKIT_DIR)
 NVCC = nvcc 
diff --git a/lib/gpu/Nvidia.makefile b/lib/gpu/Nvidia.makefile
index 495ff7d054..2a279ca0cf 100644
--- a/lib/gpu/Nvidia.makefile
+++ b/lib/gpu/Nvidia.makefile
@@ -573,6 +573,7 @@ $(BIN_DIR)/nvc_get_devices: ./geryon/ucl_get_devices.cpp $(NVD_H)
 
 $(GPU_LIB): $(OBJS) $(CUDPP)
 	$(AR) -crusv $(GPU_LIB) $(OBJS) $(CUDPP)
+	@cp $(EXTRAMAKE) Makefile.lammps
 
 clean:
 	rm -f $(EXECS) $(GPU_LIB) $(OBJS) $(CUDPP) $(CBNS) *.linkinfo
diff --git a/lib/gpu/Opencl.makefile b/lib/gpu/Opencl.makefile
index 4ace9bd3c1..e66accfe70 100644
--- a/lib/gpu/Opencl.makefile
+++ b/lib/gpu/Opencl.makefile
@@ -407,6 +407,7 @@ $(BIN_DIR)/ocl_get_devices: ./geryon/ucl_get_devices.cpp
 
 $(OCL_LIB): $(OBJS) $(PTXS)
 	$(AR) -crusv $(OCL_LIB) $(OBJS)
+	@cp $(EXTRAMAKE) Makefile.lammps
 
 opencl: $(OCL_EXECS)