diff --git a/Defaults.mk.in b/Defaults.mk.in
index a344bdf8..a16e4e53 100644
--- a/Defaults.mk.in
+++ b/Defaults.mk.in
@@ -11,3 +11,4 @@ TFTPDIR ?= @TFTPDIR@
 FIREWALLDDIR ?= @FIREWALLDDIR@
 SYSTEMDDIR ?= @SYSTEMDDIR@
 BASH_COMPLETION ?= @BASH_COMPLETION@
+WWCLIENTLOC ?= @WWCLIENTLOC@
diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go
index d25b0fc8..e61534fd 100644
--- a/internal/app/wwclient/root.go
+++ b/internal/app/wwclient/root.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"path"
 	"strings"
 	"syscall"
 	"time"
@@ -62,7 +63,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		return errors.New("found pidfile " + PIDFile + " not starting")
 	}
 
-	if os.Args[0] == buildconfig.WWCLIENTLOC() {
+	if os.Args[0] == path.Join(buildconfig.WWCLIENTLOC(), "wwclient") {
 		err := os.Chdir("/")
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "failed to change dir: %s", err)
@@ -74,6 +75,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 	} else {
 		fmt.Printf("Called via: %s\n", os.Args[0])
 		fmt.Printf("Runtime overlay is being put in '/warewulf/wwclient-test' rather than '/'\n")
+		fmt.Printf("For full functionality call with: %s\n", path.Join(buildconfig.WWCLIENTLOC(), "wwclient"))
 		err := os.MkdirAll("/warewulf/wwclient-test", 0755)
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "failed to create dir: %s", err)
diff --git a/internal/pkg/buildconfig/setconfigs.go.in b/internal/pkg/buildconfig/setconfigs.go.in
index 1193a80b..7efea348 100644
--- a/internal/pkg/buildconfig/setconfigs.go.in
+++ b/internal/pkg/buildconfig/setconfigs.go.in
@@ -13,5 +13,5 @@ func init() {
     wwprovisiondir = "@WWPROVISIONDIR@"
     version = "@VERSION@"
     release = "@RELEASE@"
-    wwclientloc = "@WWCLIENTLOC"
+    wwclientloc = "@WWCLIENTLOC@"
 }