diff --git a/src/genpinmap/genpinmap_arduino.py b/src/genpinmap/genpinmap_arduino.py
index 39330a1f7..f6aa09f9d 100644
--- a/src/genpinmap/genpinmap_arduino.py
+++ b/src/genpinmap/genpinmap_arduino.py
@@ -561,7 +561,7 @@ def sort_my_lists():
 for s in itemlist:
     m = re.match(pinregex, s.attributes['Name'].value)
     if m:
-        pin = m.group(0) # pin formatted P<port><number>: PFO
+        pin = m.group(0)[:2] + '_' + m.group(0)[2:] # pin formatted P<port>_<number>: PF_O
         name = s.attributes['Name'].value.strip()   # full name: "PF0 / OSC_IN"
         if s.attributes['Type'].value == "I/O":
             store_pin(pin, name)