diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
index 844fc66f..e0ba75b5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
@@ -513,6 +513,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
index 721416eb..a8f190ed 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
@@ -554,6 +554,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
index b9cc4c59..523e5d42 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
@@ -722,6 +722,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
index 7d27ad6b..dc6c3ce3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
@@ -854,6 +854,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
index 2c078cff..a6b85a8f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
@@ -499,6 +499,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
index 012c9059..e42bbb2d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
@@ -534,6 +534,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
index 0e71ef0a..39c9a4ed 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
@@ -706,6 +706,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
index 3f4b611f..fdc9e66d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
@@ -814,6 +814,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
index 4cf81baa..42f2c50a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
@@ -513,6 +513,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
index 04e6994c..cf59e1b0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
@@ -554,6 +554,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
index fb6af29b..e5e4ad9b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
@@ -722,6 +722,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
index a90fcaca..45c39b1b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
@@ -499,6 +499,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
index 9cd0464b..1fcf2df9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
@@ -534,6 +534,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
index e2c4e1c2..aa710800 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
@@ -706,6 +706,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
index 394e45ce..61ea1b83 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
@@ -513,6 +513,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
index 296098f7..f7e3bc3b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
@@ -554,6 +554,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
index 73268a85..f0561b33 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
@@ -722,6 +722,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
index cac32f51..c79ade1f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
@@ -854,6 +854,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
index 6ddccce0..ab3c1605 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
@@ -499,6 +499,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
index 71974a2d..8d9fc122 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
@@ -534,6 +534,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
index c3065788..0cc25363 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
@@ -706,6 +706,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
index b11bb8ac..c3382667 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
@@ -814,6 +814,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
index e4d8d820..a2028718 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
@@ -409,6 +409,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
index 27bed4a5..22f3a916 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
@@ -467,6 +467,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
index dd64ba90..bdc44e21 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
@@ -512,6 +512,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
index 20f37209..034793e8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
@@ -534,6 +534,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00800000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
index baed8b1b..c9b2d501 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
@@ -463,6 +463,7 @@
                 <property name="INTERRUPT_VECTOR_SIZE" value="4"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
index 5d7ca75a..0d94395c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
@@ -534,6 +534,7 @@
                 <property name="INTERRUPT_VECTOR_SIZE" value="4"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
index 3fc9b7a1..a196395d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
@@ -462,6 +462,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
index 7ae8cba3..95fcc86f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
@@ -533,6 +533,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
index 9d40f597..559b6db4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
@@ -462,6 +462,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
index cb42ca7b..7afff742 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
@@ -533,6 +533,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
index b520ed43..161f0284 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
@@ -463,6 +463,7 @@
                 <property name="INTERRUPT_VECTOR_SIZE" value="4"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
index b99c8983..2ed4d43e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
@@ -534,6 +534,7 @@
                 <property name="INTERRUPT_VECTOR_SIZE" value="4"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00004000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
index bd5e9525..168b5ac5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
@@ -345,6 +345,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
index b0824900..d79825a0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
@@ -389,6 +389,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
index 15461df9..962eedd9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
@@ -402,6 +402,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
index 1b00b89e..0ef7962d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
@@ -430,6 +430,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
index 7b6f90c4..7d0ba17f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
@@ -496,6 +496,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
index ec770be4..675bbcef 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
@@ -522,6 +522,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
index dc94d7d9..50107b52 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
@@ -355,6 +355,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
index 72d5a7bc..d6f4bdd2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
@@ -399,6 +399,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
index de79de00..198a761e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
@@ -410,6 +410,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
index 172b473c..f80a24af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
@@ -309,6 +309,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
index 6cec1b9e..1f631640 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
@@ -345,6 +345,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
index 71bd5b32..ceaf300e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
@@ -328,6 +328,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
index 072a5fe7..e58ac0ad 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
@@ -366,6 +366,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
index e945b602..01f33ffb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
@@ -492,6 +492,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
index 2cb8040f..b08d64bf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
@@ -522,6 +522,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
index 35708fd3..8ee69a40 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
@@ -309,6 +309,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
index c8ccba21..966596d2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
@@ -345,6 +345,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
index af76a6b5..a978fecc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
@@ -388,6 +388,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
index 669640d0..5b3e3912 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
@@ -328,6 +328,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
index a775a696..7e2892e0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
@@ -366,6 +366,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
index 118cbc85..4575875f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
@@ -411,6 +411,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
index 9b3b2e68..cd8ae05e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
@@ -445,6 +445,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
index e2c2e589..3a1b8b64 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
@@ -345,6 +345,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
index 2e4b3bd8..c6366e72 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
@@ -389,6 +389,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
index 9b9653aa..a968912d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
@@ -402,6 +402,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
index d6fdbf04..a46dfaa7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
@@ -386,6 +386,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
index 59838cc8..9488037b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
@@ -434,6 +434,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
index 0b32848e..bd5d80b1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
@@ -447,6 +447,7 @@
                 <property name="FUSE_ENABLED_VALUE" value="1"/>
             </property-group>
             <property-group name="UPDI_INTERFACE">
+                <property name="OCD_BASE_ADDR" value="0x00000F80"/>
                 <property name="PROGMEM_OFFSET" value="0x00008000"/>
             </property-group>
             <property-group name="SIGNATURES">