diff --git a/tools/lammps-shell/Makefile b/tools/lammps-shell/Makefile
index 434fc471aa..c241166659 100644
--- a/tools/lammps-shell/Makefile
+++ b/tools/lammps-shell/Makefile
@@ -1,8 +1,11 @@
 SHELL=/bin/sh
 
-CXX=g++
-CXXFLAGS=-O -g -Wall -I../../src -DLAMMPS_LIB_NO_MPI
-LDFLAGS= -L../../src -llammps -lreadline
+CXX=g++ -std=c++11
+#CXX=g++
+CXXFLAGS=-O -g -Wall -I../../src $(shell pkg-config --cflags readline)
+#CXXFLAGS=-O -g -Wall -I../../src
+LDFLAGS= -L../../src -Wl,-rpath,../../src -llammps $(shell pkg-config --libs readline)
+#LDFLAGS= -L../../src -llammps -lreadline
 
 lammps-shell: lammps-shell.o
 	$(CXX) -o $@ $^ $(LDFLAGS)
@@ -11,4 +14,4 @@ lammps-shell.o: lammps-shell.cpp
 	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
 clean:
-	@rm -f lammps-shell lammps-shell.o core *~ .lammps-history
+	@rm -f lammps-shell lammps-shell.o core *~ .lammps-history log.lammps log.cite