diff --git a/command/agent/command.go b/command/agent/command.go
index de474567d3..2ea01171f8 100644
--- a/command/agent/command.go
+++ b/command/agent/command.go
@@ -80,7 +80,7 @@ func (c *Command) readConfig() *Config {
 
 	cmdFlags.StringVar(&cmdConfig.ClientAddr, "client", "", "address to bind client listeners to (DNS, HTTP, HTTPS, RPC)")
 	cmdFlags.StringVar(&cmdConfig.BindAddr, "bind", "", "address to bind server listeners to")
-	cmdFlags.IntVar(&cmdConfig.HttpPort, "http-port", 0, "http port to use")
+	cmdFlags.IntVar(&cmdConfig.Ports.HTTP, "http-port", 0, "http port to use")
 	cmdFlags.StringVar(&cmdConfig.AdvertiseAddr, "advertise", "", "address to advertise instead of bind addr")
 	cmdFlags.StringVar(&cmdConfig.AdvertiseAddrWan, "advertise-wan", "", "address to advertise on wan instead of bind or advertise addr")
 
diff --git a/command/agent/config.go b/command/agent/config.go
index 22331d0d63..716b6e8e11 100644
--- a/command/agent/config.go
+++ b/command/agent/config.go
@@ -141,11 +141,6 @@ type Config struct {
 	// client services (DNS, HTTP, HTTPS, RPC)
 	ClientAddr string `mapstructure:"client_addr"`
 
-	// HttpPort the HTTP port to listen on.
-	// This is useful e.g. when deploying to Cloud Foundry to make
-	// the HTTP API easily routable
-	HttpPort int `mapstructure:"http_port"`
-
 	// BindAddr is used to control the address we bind to.
 	// If not specified, the first private IP we find is used.
 	// This controls the address we use for cluster facing
@@ -854,8 +849,8 @@ func MergeConfig(a, b *Config) *Config {
 	if b.BindAddr != "" {
 		result.BindAddr = b.BindAddr
 	}
-	if b.HttpPort != 0 {
-		result.Ports.HTTP = b.HttpPort
+	if b.Ports.HTTP != 0 {
+		result.Ports.HTTP = b.Ports.HTTP
 	}
 	if b.AdvertiseAddr != "" {
 		result.AdvertiseAddr = b.AdvertiseAddr