diff --git a/fluffy/fluffy.nim b/fluffy/fluffy.nim
index 0d123b07f..f22d546bb 100644
--- a/fluffy/fluffy.nim
+++ b/fluffy/fluffy.nim
@@ -147,6 +147,10 @@ proc run(config: PortalConf) {.raises: [CatchableError].} =
     d = newProtocol(
       netkey,
       extIp, none(Port), extUdpPort,
+      # Note: The addition of default clientInfo to the ENR is a temporary
+      # measure to easily identify & debug the clients used in the testnet.
+      # Might make this into a, default off, cli option.
+      localEnrFields = {"c": enrClientInfoShort},
       bootstrapRecords = bootstrapRecords,
       bindIp = bindIp, bindPort = udpPort,
       enrAutoUpdate = config.enrAutoUpdate,
diff --git a/fluffy/version.nim b/fluffy/version.nim
index b0a63508a..e220d7177 100644
--- a/fluffy/version.nim
+++ b/fluffy/version.nim
@@ -9,6 +9,7 @@
 
 import
   std/strutils,
+  stew/byteutils,
   metrics
 
 const
@@ -38,6 +39,9 @@ const
   copyrightBanner* =
     "Copyright (c) 2021-" & compileYear & " Status Research & Development GmbH"
 
+  # Short debugging identifier to be placed in the ENR
+  enrClientInfoShort* = toBytes("f")
+
 func getNimGitHash*(): string =
   const gitPrefix = "git hash: "
   let tmp = splitLines(nimFullBanner)