diff --git a/targets/atmega1284p.json b/targets/atmega1284p.json
index ef423942..2c2d29e1 100644
--- a/targets/atmega1284p.json
+++ b/targets/atmega1284p.json
@@ -1,6 +1,5 @@
 {
     "inherits": ["avr"],
-    "llvm-target": "avr-atmel-none",
     "cpu": "atmega1284p",
     "build-tags": ["atmega1284p", "atmega"],
     "cflags": [
diff --git a/targets/atmega2560.json b/targets/atmega2560.json
index 420e803a..f460c9c8 100644
--- a/targets/atmega2560.json
+++ b/targets/atmega2560.json
@@ -1,6 +1,5 @@
 {
     "inherits": ["avr"],
-    "llvm-target": "avr-atmel-none",
     "cpu": "atmega2560",
     "build-tags": ["atmega2560", "atmega"],
     "cflags": [
diff --git a/targets/atmega328p.json b/targets/atmega328p.json
index 64aefc98..181da693 100644
--- a/targets/atmega328p.json
+++ b/targets/atmega328p.json
@@ -1,6 +1,5 @@
 {
 	"inherits": ["avr"],
-	"llvm-target": "avr-atmel-none",
 	"cpu": "atmega328p",
 	"build-tags": ["atmega328p", "atmega", "avr5"],
 	"cflags": [
diff --git a/targets/avr.json b/targets/avr.json
index 932717e2..ae7c6860 100644
--- a/targets/avr.json
+++ b/targets/avr.json
@@ -1,4 +1,5 @@
 {
+	"llvm-target": "avr-unknown-unknown",
 	"build-tags": ["avr", "baremetal", "linux", "arm"],
 	"goos": "linux",
 	"goarch": "arm",
diff --git a/targets/digispark.json b/targets/digispark.json
index 90401283..06861f4a 100644
--- a/targets/digispark.json
+++ b/targets/digispark.json
@@ -1,6 +1,5 @@
 {
 	"inherits": ["avr"],
-	"llvm-target": "avr-atmel-none",
 	"cpu": "attiny85",
 	"build-tags": ["digispark", "attiny85", "attiny", "avr2", "avr25"],
 	"cflags": [
diff --git a/transform/testdata/interrupt-avr.ll b/transform/testdata/interrupt-avr.ll
index 1c195634..80570c0b 100644
--- a/transform/testdata/interrupt-avr.ll
+++ b/transform/testdata/interrupt-avr.ll
@@ -1,5 +1,5 @@
 target datalayout = "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8"
-target triple = "avr-atmel-none"
+target triple = "avr-unknown-unknown"
 
 %"runtime/interrupt.handle" = type { %runtime.funcValue, %"runtime/interrupt.Interrupt" } %runtime.funcValue = type { i8*, i16 }
 %runtime.typecodeID = type { %runtime.typecodeID*, i16 }
diff --git a/transform/testdata/interrupt-avr.out.ll b/transform/testdata/interrupt-avr.out.ll
index 322d6516..3f3c881f 100644
--- a/transform/testdata/interrupt-avr.out.ll
+++ b/transform/testdata/interrupt-avr.out.ll
@@ -1,5 +1,5 @@
 target datalayout = "e-P1-p:16:8-i8:8-i16:8-i32:8-i64:8-f32:8-f64:8-n8-a:8"
-target triple = "avr-atmel-none"
+target triple = "avr-unknown-unknown"
 
 %runtime.typecodeID = type { %runtime.typecodeID*, i16 }
 %runtime.funcValueWithSignature = type { i16, %runtime.typecodeID* }