diff --git a/p2p/peer.go b/p2p/peer.go
index 9776031472..b9d6c099dd 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -58,7 +58,7 @@ type protoHandshake struct {
 	ID         discover.NodeID
 
 	// Ignore additional fields (for forward compatibility).
-	Rest []rlp.RawValue `rlp:".."`
+	Rest []rlp.RawValue `rlp:"tail"`
 }
 
 // Peer represents a connected remote node.
diff --git a/p2p/rlpx.go b/p2p/rlpx.go
index a0b064cabd..feab20ba8d 100644
--- a/p2p/rlpx.go
+++ b/p2p/rlpx.go
@@ -210,7 +210,7 @@ type authMsgV4 struct {
 	Version         uint
 
 	// Ignore additional fields (forward-compatibility)
-	Rest []rlp.RawValue `rlp:".."`
+	Rest []rlp.RawValue `rlp:"tail"`
 }
 
 // RLPx v4 handshake response (defined in EIP-8).
@@ -220,7 +220,7 @@ type authRespV4 struct {
 	Version      uint
 
 	// Ignore additional fields (forward-compatibility)
-	Rest []rlp.RawValue `rlp:".."`
+	Rest []rlp.RawValue `rlp:"tail"`
 }
 
 // secrets is called after the handshake is completed.