diff --git a/boards/sam4e8e.json b/boards/sam4e8e.json
new file mode 100644
index 0000000..2cfd81d
--- /dev/null
+++ b/boards/sam4e8e.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+        "ldscript": "flash.ld"
+    },
+    "core": "arduino",
+    "cpu": "cortex-m4",
+    "extra_flags": "-D__SAM4E8E__",
+    "f_cpu": "120000000L",
+    "hwids": [
+      [
+        "0x03EB",
+        "0x6124"
+      ]
+    ],
+    "mcu": "at91sam4e8e",
+    "usb_product": "Atmel SAM4",
+    "variant": "sam4e8e",
+    "libsam" : "libsam_sam4e8e_gcc_rel"
+  },
+  "debug": {
+    "jlink_device": "ATSAM4E8E",
+    "openocd_chipname": "atsam4E8E",
+    "openocd_target": "at91sam4XXX",
+    "svd_path": "ATSAM4E8E.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "zephyr"
+  ],
+  "name": "Generic ATSAM4E",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 98304,
+    "maximum_size": 524288,
+    "native_usb": true,
+    "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.microchip.com/wwwproducts/en/ATsam4e8e",
+  "vendor": "Microchip"
+}
diff --git a/boards/sam4s4a.json b/boards/sam4s4a.json
new file mode 100644
index 0000000..7819daf
--- /dev/null
+++ b/boards/sam4s4a.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+        "ldscript": "flash.ld"
+    },
+    "core": "arduino",
+    "cpu": "cortex-m4",
+    "extra_flags": "-D__SAM4S4A__",
+    "f_cpu": "120000000L",
+    "hwids": [
+      [
+        "0x03EB",
+        "0x6124"
+      ]
+    ],
+    "mcu": "at91sam4s4a",
+    "usb_product": "Atmel SAM4",
+    "variant": "motionbow",
+    "libsam" : "libsam_sam4s4a_gcc_rel"
+  },
+  "debug": {
+    "jlink_device": "ATSAM4S4A",
+    "openocd_chipname": "atsam4S4A",
+    "openocd_target": "at91sam4XXX",
+    "svd_path": "ATSAM4S4A.svd"
+  },
+  "frameworks": [
+    "arduino",
+    "zephyr"
+  ],
+  "name": "Generic ATSAM4E",
+  "upload": {
+    "disable_flushing": true,
+    "maximum_ram_size": 98304,
+    "maximum_size": 524288,
+    "native_usb": true,
+    "protocol": "sam-ba",
+    "protocols": [
+      "sam-ba",
+      "jlink",
+      "blackmagic"
+    ],
+    "require_upload_port": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://www.microchip.com/wwwproducts/en/ATsam4e8e",
+  "vendor": "Microchip"
+}
diff --git a/builder/frameworks/arduino/arduino-sam.py b/builder/frameworks/arduino/arduino-sam.py
index dac42d0..bac555d 100644
--- a/builder/frameworks/arduino/arduino-sam.py
+++ b/builder/frameworks/arduino/arduino-sam.py
@@ -40,6 +40,11 @@
 assert os.path.isdir(SYSTEM_DIR)
 assert os.path.isdir(FRAMEWORK_DIR)
 
+if "build.libsam" in board:
+    libsam_name = board.get("build.libsam", "")
+else: 
+    libsam_name = "sam_sam3x8e_gcc_rel"
+
 env.SConscript("arduino-common.py")
 
 env.Append(
@@ -61,7 +66,7 @@
         "-u", "_getpid"
     ],
 
-    LIBS=["sam_sam3x8e_gcc_rel", "gcc"]
+    LIBS=[libsam_name, "gcc"]
 )
 
 #
diff --git a/examples/arduino-blink/platformio.ini b/examples/arduino-blink/platformio.ini
index febffa4..769c1af 100644
--- a/examples/arduino-blink/platformio.ini
+++ b/examples/arduino-blink/platformio.ini
@@ -121,3 +121,10 @@ framework = arduino
 platform = atmelsam
 board = seeed_wio_lite_mg126
 framework = arduino
+
+[env:sam4e8e]
+platform = atmelsam
+board = sam4e8e
+framework = arduino
+platform_packages =
+  toolchain-gccarmnoneeabi @ 1.40804.0
\ No newline at end of file