diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd1fab4a..858a2651 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,9 +107,10 @@ else()
     message(STATUS "Pluto disabled")
 endif()
 
+add_library(goatbase STATIC ${GOAT_BASE})
+add_library(ghist STATIC ${GOAT_GHIST})
 
 add_executable(goat
-   ${GOAT_BASE}
    inc/GDataChecks.h
    src/GDataChecks.cc
    inc/GParticleReconstruction.h
@@ -122,18 +123,16 @@ add_executable(goat
    src/GoAT.cc
    src/goat_main.cc
    )
-target_link_libraries(goat ${LIBS} ${ROOT_LIBRARIES})
+target_link_libraries(goat goatbase ${LIBS} ${ROOT_LIBRARIES})
 
 add_executable(pi0-example
-   ${GOAT_BASE}
-   ${GOAT_GHIST}
    inc/PPhysics.h
    src/PPhysics.cc
    inc/PPi0Example.h
    src/PPi0Example.cc
    src/pi0_example_main.cc
    )
-target_link_libraries(pi0-example ${LIBS} ${ROOT_LIBRARIES})
+target_link_libraries(pi0-example goatbase ghist ${LIBS} ${ROOT_LIBRARIES})
 
 # install some scripts to the bin directory
 # by creating symlinks
diff --git a/scripts/NewPhysics.sh b/scripts/NewPhysics.sh
index 2a4d30f4..57813a17 100755
--- a/scripts/NewPhysics.sh
+++ b/scripts/NewPhysics.sh
@@ -13,15 +13,13 @@ LINE=`grep -n pi0-example ${GOATDIR}/CMakeLists.txt | tail -1 | sed 's/:/ /' | a
 head -n $LINE ${GOATDIR}/CMakeLists.txt > ${GOATDIR}/CMakeLists.new
 
 echo "add_executable(${NAME}" >> ${GOATDIR}/CMakeLists.new
-echo "   \${GOAT_BASE}" >> ${GOATDIR}/CMakeLists.new
-echo "   \${GOAT_GHIST}" >> ${GOATDIR}/CMakeLists.new
 echo "   inc/PPhysics.h" >> ${GOATDIR}/CMakeLists.new
 echo "   src/PPhysics.cc" >> ${GOATDIR}/CMakeLists.new
 echo "   inc/P${CODE}.h" >> ${GOATDIR}/CMakeLists.new
 echo "   src/P${CODE}.cc" >> ${GOATDIR}/CMakeLists.new
 echo "   src/${MAIN}_main.cc" >> ${GOATDIR}/CMakeLists.new
 echo "   )" >> ${GOATDIR}/CMakeLists.new
-echo "target_link_libraries(${NAME} \${LIBS} \${ROOT_LIBRARIES})" >> ${GOATDIR}/CMakeLists.new
+echo "target_link_libraries(${NAME} goatbase ghist \${LIBS} \${ROOT_LIBRARIES})" >> ${GOATDIR}/CMakeLists.new
 
 tail -n +$LINE ${GOATDIR}/CMakeLists.txt >> ${GOATDIR}/CMakeLists.new