diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 8e55b310c..11ea23165 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -308,7 +308,7 @@ func console(ctx *cli.Context) {
 		ethereum,
 		ctx.String(utils.JSpathFlag.Name),
 		ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
-		ctx.GlobalString(utils.IPCPathFlag.Name),
+		filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "geth.ipc"),
 		true,
 		nil,
 	)
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 4c3690d49..80f21d50a 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -387,7 +387,7 @@ func MakeAccountManager(ctx *cli.Context) *accounts.Manager {
 
 func StartIPC(eth *eth.Ethereum, ctx *cli.Context) error {
 	config := comms.IpcConfig{
-		Endpoint: ctx.GlobalString(IPCPathFlag.Name),
+		Endpoint: filepath.Join(ctx.GlobalString(DataDirFlag.Name), "geth.ipc"),
 	}
 
 	xeth := xeth.New(eth, nil)