diff --git a/Makefile b/Makefile
index f772eec3..d431dbeb 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ debfiles: debian
 	cp wwclient $(DESTDIR)/var/warewulf/overlays/system/debian/warewulf/bin/
 
 wwctl:
-	cd cmd/wwctl; GOOS=linux go build -ldflags="-X 'github.com/hpcng/warewulf/internal/app/wwctl/version.Version=$(VERSION_FULL)'" -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl
+	cd cmd/wwctl; GOOS=linux go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/version.Version=$(VERSION_FULL)'" -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl
 
 wwclient:
 	cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags '-extldflags -static' -o ../../wwclient
diff --git a/internal/app/wwctl/version/main.go b/internal/app/wwctl/version/main.go
index f977b662..08e48d09 100644
--- a/internal/app/wwctl/version/main.go
+++ b/internal/app/wwctl/version/main.go
@@ -3,14 +3,13 @@ package version
 import (
 	"fmt"
 
+	"github.com/hpcng/warewulf/internal/pkg/version"
 	"github.com/spf13/cobra"
 )
 
-var Version = "development"
-
 func CobraRunE(cmd *cobra.Command, args []string) error {
 
-	fmt.Println("Version:\t", Version)
+	fmt.Println("Version:\t", version.GetVersion())
 
 	return nil
 }
diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go
new file mode 100644
index 00000000..0e8e1a5a
--- /dev/null
+++ b/internal/pkg/version/version.go
@@ -0,0 +1,7 @@
+package version
+
+var Version string = "development"
+
+func GetVersion() string {
+	return Version
+}
diff --git a/internal/pkg/warewulfd/daemon.go b/internal/pkg/warewulfd/daemon.go
index 042808d0..acb04ac8 100644
--- a/internal/pkg/warewulfd/daemon.go
+++ b/internal/pkg/warewulfd/daemon.go
@@ -9,6 +9,7 @@ import (
 	"syscall"
 
 	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/version"
 	"github.com/pkg/errors"
 )
 
@@ -53,7 +54,7 @@ func DaemonStart() error {
 
 		fmt.Fprintf(p, "%d", pid)
 
-		fmt.Printf("Started Warewulf server at PID: %d\n", pid)
+		fmt.Printf("Started Warewulf (%s) server at PID: %d\n", version.GetVersion(), pid)
 
 	}