diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bb1b502d6..640f2ce2fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## Unreleased
+
+### Improvements
+
+* (feemarket) [\#1165](https://github.com/evmos/ethermint/pull/1165) Add hint in specs about different gas terminology for gas in Cosmos and Ethereum.
+
 ## [v0.17.0] - 2022-06-27
 
 ### State Machine Breaking
diff --git a/Makefile b/Makefile
index 2e1eeaa5a0..1f183ab729 100755
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ build-all: tools build lint test
 ###############################################################################
 
 PACKAGE_NAME:=github.com/evmos/ethermint
-GOLANG_CROSS_VERSION  = v1.18
+GOLANG_CROSS_VERSION = v1.18
 GOPATH ?= '$(HOME)/go'
 release-dry-run:
 	docker run \
diff --git a/x/feemarket/spec/01_concepts.md b/x/feemarket/spec/01_concepts.md
index 878ccf637a..12071d7b5b 100644
--- a/x/feemarket/spec/01_concepts.md
+++ b/x/feemarket/spec/01_concepts.md
@@ -24,6 +24,10 @@ fee = (baseFee + priorityTip) * gasLimit
 
 , where `baseFee` is the fixed-per-block network fee per gas and `priorityTip` is an additional fee per gas that can be set optionally. Note, that both the base fee and the priority tip are a gas prices. To submit a transaction with EIP-1559, the signer needs to specify the `gasFeeCap` a maximum fee per gas they are willing to pay total and optionally the `priorityTip` , which covers both the priority fee and the block's network fee per gas (aka: base fee).
 
+::: tip
+The Cosmos SDK uses a different terminology for `gas` than Ethereum. What is called `gasLimit` on Ethereum is called `gasWanted` on Cosmos. You might encounter both terminologies on Evmos since it builds Ethereum on top of the SDK, e.g. when using different wallets like Keplr for Cosmos and Metamask for Ethereum.
+:::
+
 ## Base Fee
 
 The base fee per gas (aka base fee) is a global gas price defined at the consensus level. It is stored as a module parameter and is adjusted at the end of each block based on the total gas used in the previous block and gas target (`block gas limit / elasticity multiplier`):