diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index e1d1d2c1b9..02021faa6c 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -317,6 +317,8 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.ExecFlag,
 		utils.WhisperEnabledFlag,
 		utils.SwarmConfigPathFlag,
+		utils.SwarmSwapDisabled,
+		utils.SwarmPortFlag,
 		utils.SwarmAccountAddrFlag,
 		utils.ChequebookAddrFlag,
 		utils.DevModeFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index a28c43fd73..8dd0d08e44 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -351,6 +351,10 @@ var (
 		Name:  "bzzaccount",
 		Usage: "Swarm account address (swarm disabled if empty)",
 	}
+	SwarmPortFlag = cli.StringFlag{
+		Name:  "bzzport",
+		Usage: "Swarm local http api port",
+	}
 	SwarmConfigPathFlag = cli.StringFlag{
 		Name:  "bzzconfig",
 		Usage: "Swarm config file path (datadir/bzz)",
@@ -786,6 +790,10 @@ func MakeSystemNode(name, version string, extra []byte, ctx *cli.Context) *node.
 		if err != nil {
 			Fatalf("unable to configure swarm: %v", err)
 		}
+		bzzport := ctx.GlobalString(SwarmPortFlag.Name)
+		if len(bzzport) > 0 {
+			bzzconfig.Port = bzzport
+		}
 		swap := ctx.GlobalBool(SwarmSwapDisabled.Name)
 		if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
 			return swarm.NewSwarm(ctx, bzzconfig, swap)