Index: funcmap/fmexample.rs
===================================================================
--- funcmap/fmexample.rs	(revision 9364)
+++ funcmap/fmexample.rs	(revision 9365)
@@ -36,8 +36,7 @@
 								{ PB6/ADC6     -> sigtype=analog;  dir=input  }
 								{ PA0/PA0      -> sigtype=digital; }
 								{ PA0/PCINT0   -> sigtype=digital; dir=input  }
-								{ PA0/AREF     -> sigtype=analog;  dir=input  }
-								{ PA0/ADC0     -> sigtype=analog;  dir=input  }
+								{ PA0/AREF+ADC0-> sigtype=analog;  dir=input  }
 								{ PA1/PA1      -> sigtype=digital; }
 								{ PA1/PCINT1   -> sigtype=digital; dir=input  }
 								{ PA1/AIN0     -> sigtype=analog;  dir=input  }
@@ -71,7 +70,7 @@
 								{ pcint        -> PCINT8, PCINT9, PCINT11, PCINT10, PCINT7, PCINT6, PCINT0, PCINT1, PCINT2, PCINT3, PCINT4, PCINT5 }
 								{ xtal         -> XTAL1, XTAL2 }
 								{ PWM          -> OC0A, OC0B, OC1A, OC1B }
-								{ adc          -> AREF, ADC0, ADC1, ADC2, ADC3, ADC4, ADC5, ADC6, ADC7 }
+								{ adc          -> AREF+ADC0, ADC1, ADC2, ADC3, ADC4, ADC5, ADC6, ADC7 }
 								{ comparator   -> AIN0, AIN1 }
 							}
 						}
@@ -342,6 +341,7 @@
 							ha:text.3 { x1=-500; y1=-2000; mirx=1; dyntext=1; stroke=term-secondary; text=%../a.funcmap/name%; }
 						}
 						ha:attrib {
+							funcmap/name=MISO
 							name=PA5
 							pinnum=8
 							role=terminal
Index: funcmap/funcmap/attiny24.funcmap
===================================================================
--- funcmap/funcmap/attiny24.funcmap	(revision 9364)
+++ funcmap/funcmap/attiny24.funcmap	(revision 9365)
@@ -33,8 +33,7 @@
 
 			{ PA0/PA0      -> sigtype=digital; }
 			{ PA0/PCINT0   -> sigtype=digital; dir=input  }
-			{ PA0/AREF     -> sigtype=analog;  dir=input  }
-			{ PA0/ADC0     -> sigtype=analog;  dir=input  }
+			{ PA0/AREF+ADC0-> sigtype=analog;  dir=input  }
 
 			{ PA1/PA1      -> sigtype=digital; }
 			{ PA1/PCINT1   -> sigtype=digital; dir=input  }
@@ -70,7 +69,7 @@
 			{ pcint        -> PCINT8, PCINT9, PCINT11, PCINT10, PCINT7, PCINT6, PCINT0, PCINT1, PCINT2, PCINT3, PCINT4, PCINT5 }
 			{ xtal         -> XTAL1, XTAL2 }
 			{ PWM          -> OC0A, OC0B, OC1A, OC1B }
-			{ adc          -> AREF, ADC0, ADC1, ADC2, ADC3, ADC4, ADC5, ADC6, ADC7 }
+			{ adc          -> AREF+ADC0, ADC1, ADC2, ADC3, ADC4, ADC5, ADC6, ADC7 }
 			{ comparator   -> AIN0, AIN1 }
 		}