diff --git a/cmd/ipfs/daemon.go b/cmd/ipfs/daemon.go
index ec5a979e16d..ed4cf4f4672 100644
--- a/cmd/ipfs/daemon.go
+++ b/cmd/ipfs/daemon.go
@@ -726,7 +726,11 @@ func YesNoPrompt(prompt string) bool {
 }
 
 func printVersion() {
-	fmt.Printf("go-ipfs version: %s-%s\n", version.CurrentVersionNumber, version.CurrentCommit)
+	v := version.CurrentVersionNumber
+	if version.CurrentCommit != "" {
+		v += "-" + version.CurrentCommit
+	}
+	fmt.Printf("go-ipfs version: %s\n", v)
 	fmt.Printf("Repo version: %d\n", fsrepo.RepoVersion)
 	fmt.Printf("System version: %s\n", runtime.GOARCH+"/"+runtime.GOOS)
 	fmt.Printf("Golang version: %s\n", runtime.Version())
diff --git a/core/commands/version.go b/core/commands/version.go
index b1b7ca2c630..ce7b60edd47 100644
--- a/core/commands/version.go
+++ b/core/commands/version.go
@@ -54,21 +54,25 @@ var VersionCmd = &cmds.Command{
 	},
 	Encoders: cmds.EncoderMap{
 		cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, version *VersionOutput) error {
-			commit, _ := req.Options[versionCommitOptionName].(bool)
-			commitTxt := ""
-			if commit {
-				commitTxt = "-" + version.Commit
-			}
-
 			all, _ := req.Options[versionAllOptionName].(bool)
 			if all {
-				out := fmt.Sprintf("go-ipfs version: %s-%s\n"+
+				ver := version.Version
+				if version.Commit != "" {
+					ver += "-" + version.Commit
+				}
+				out := fmt.Sprintf("go-ipfs version: %s\n"+
 					"Repo version: %s\nSystem version: %s\nGolang version: %s\n",
-					version.Version, version.Commit, version.Repo, version.System, version.Golang)
+					ver, version.Repo, version.System, version.Golang)
 				fmt.Fprint(w, out)
 				return nil
 			}
 
+			commit, _ := req.Options[versionCommitOptionName].(bool)
+			commitTxt := ""
+			if commit && version.Commit != "" {
+				commitTxt = "-" + version.Commit
+			}
+
 			repo, _ := req.Options[versionRepoOptionName].(bool)
 			if repo {
 				fmt.Fprintln(w, version.Repo)
diff --git a/core/core.go b/core/core.go
index 0f3b7083b66..0dba021e372 100644
--- a/core/core.go
+++ b/core/core.go
@@ -12,6 +12,7 @@ package core
 import (
 	"context"
 	"io"
+	"path"
 
 	"github.com/ipfs/go-filestore"
 	version "github.com/ipfs/go-ipfs"
@@ -54,7 +55,7 @@ import (
 var log = logging.Logger("core")
 
 func init() {
-	identify.ClientVersion = "go-ipfs/" + version.CurrentVersionNumber + "/" + version.CurrentCommit
+	identify.ClientVersion = path.Join("go-ipfs", version.CurrentVersionNumber, version.CurrentCommit)
 }
 
 // IpfsNode is IPFS Core module. It represents an IPFS instance.