diff --git a/PENDING.md b/PENDING.md
index 1531db5e99..a39f534b10 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -113,6 +113,7 @@ IMPROVEMENTS
     * Validators specify minimum gas prices instead of minimum fees
     * Clients may provide either fees or gas prices directly
     * The gas prices of a tx must meet a validator's minimum
+    * `gaiad start` and `gaia.toml` take --minimum-gas-prices flag and minimum-gas-price config key respectively.
   * [\#2859](https://github.com/cosmos/cosmos-sdk/issues/2859) Rename `TallyResult` in gov proposals to `FinalTallyResult`
   * [\#3286](https://github.com/cosmos/cosmos-sdk/pull/3286) Fix `gaiad gentx` printout of account's addresses, i.e. user bech32 instead of hex.
 
diff --git a/cmd/gaia/cli_test/cli_test.go b/cmd/gaia/cli_test/cli_test.go
index 357aef7300..2d6864ec99 100644
--- a/cmd/gaia/cli_test/cli_test.go
+++ b/cmd/gaia/cli_test/cli_test.go
@@ -52,7 +52,7 @@ func TestGaiaCLIMinimumFees(t *testing.T) {
 	// start gaiad server with minimum fees
 	minGasPrice, _ := sdk.NewDecFromStr("0.000006")
 	fees := fmt.Sprintf(
-		"--minimum_gas_prices=%s,%s",
+		"--minimum-gas-prices=%s,%s",
 		sdk.NewDecCoinFromDec(feeDenom, minGasPrice),
 		sdk.NewDecCoinFromDec(fee2Denom, minGasPrice),
 	)
@@ -87,7 +87,7 @@ func TestGaiaCLIGasPrices(t *testing.T) {
 
 	// start gaiad server with minimum fees
 	minGasPrice, _ := sdk.NewDecFromStr("0.000006")
-	proc := f.GDStart(fmt.Sprintf("--minimum_gas_prices=%s", sdk.NewDecCoinFromDec(feeDenom, minGasPrice)))
+	proc := f.GDStart(fmt.Sprintf("--minimum-gas-prices=%s", sdk.NewDecCoinFromDec(feeDenom, minGasPrice)))
 	defer proc.Stop(false)
 
 	barAddr := f.KeyAddress(keyBar)
@@ -120,7 +120,7 @@ func TestGaiaCLIFeesDeduction(t *testing.T) {
 
 	// start gaiad server with minimum fees
 	minGasPrice, _ := sdk.NewDecFromStr("0.000006")
-	proc := f.GDStart(fmt.Sprintf("--minimum_gas_prices=%s", sdk.NewDecCoinFromDec(feeDenom, minGasPrice)))
+	proc := f.GDStart(fmt.Sprintf("--minimum-gas-prices=%s", sdk.NewDecCoinFromDec(feeDenom, minGasPrice)))
 	defer proc.Stop(false)
 
 	// Save key addresses for later use
diff --git a/server/config/config.go b/server/config/config.go
index e7b2d97fae..dc9314729a 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -15,7 +15,7 @@ type BaseConfig struct {
 	// The minimum gas prices a validator is willing to accept for processing a
 	// transaction. A transaction's fees must meet the minimum of each denomination
 	// specified in this config (e.g. 0.01photino,0.0001stake).
-	MinGasPrices string `mapstructure:"minimum_gas_prices"`
+	MinGasPrices string `mapstructure:"minimum-gas-prices"`
 }
 
 // Config defines the server's top level configuration
diff --git a/server/config/toml.go b/server/config/toml.go
index 481faf6eca..7486e171f9 100644
--- a/server/config/toml.go
+++ b/server/config/toml.go
@@ -16,7 +16,7 @@ const defaultConfigTemplate = `# This is a TOML config file.
 # The minimum gas prices a validator is willing to accept for processing a
 # transaction. A transaction's fees must meet the minimum of each denomination
 # specified in this config (e.g. 0.01photino,0.0001stake).
-minimum_gas_prices = "{{ .BaseConfig.MinGasPrices }}"
+minimum-gas-prices = "{{ .BaseConfig.MinGasPrices }}"
 `
 
 var configTemplate *template.Template
diff --git a/server/start.go b/server/start.go
index b91a6a8dce..0f09f77366 100644
--- a/server/start.go
+++ b/server/start.go
@@ -21,7 +21,7 @@ const (
 	flagAddress        = "address"
 	flagTraceStore     = "trace-store"
 	flagPruning        = "pruning"
-	FlagMinGasPrices   = "minimum_gas_prices"
+	FlagMinGasPrices   = "minimum-gas-prices"
 )
 
 // StartCmd runs the service passed in, either stand-alone or in-process with