diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt
index 4fb139529..137e92b3d 100644
--- a/hardware/arduino/sam/boards.txt
+++ b/hardware/arduino/sam/boards.txt
@@ -4,8 +4,6 @@ arduino_due_u.name=Arduino DueU Dev. Ed.
 arduino_due_u.upload.tool=bossac
 arduino_due_u.upload.protocol=sam-ba
 arduino_due_u.upload.maximum_size=49152
-arduino_due_u.build.vid=0x2341
-arduino_due_u.build.pid=0x003E
 arduino_due_u.build.mcu=cortex-m3
 arduino_due_u.build.f_cpu=96000000L
 arduino_due_u.build.core=sam
@@ -13,6 +11,8 @@ arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb -DUSB_PID={build.pid} -DUS
 arduino_due_u.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_due_u.build.variant=arduino_due_u
 arduino_due_u.build.variant_system_lib=libsam_sam3u4e_gcc_rel.a
+arduino_due_u.build.vid=0x2341
+arduino_due_u.build.pid=0x003e
 
 ##############################################################
 
@@ -20,8 +20,6 @@ arduino_due_x.name=Arduino DueX Dev. Ed.
 arduino_due_x.upload.tool=bossac
 arduino_due_x.upload.protocol=sam-ba
 arduino_due_x.upload.maximum_size=49152
-arduino_due_x.build.vid=0x2341
-arduino_due_x.build.pid=0x003E
 arduino_due_x.build.mcu=cortex-m3
 arduino_due_x.build.f_cpu=84000000L
 arduino_due_x.build.core=sam
@@ -29,3 +27,5 @@ arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUS
 arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_due_x.build.variant=arduino_due_x
 arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
+arduino_due_x.build.vid=0x2341
+arduino_due_x.build.pid=0x003e
diff --git a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp b/hardware/arduino/sam/cores/sam/USB/USBCore.cpp
index 673805edc..9b283d6d0 100644
--- a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp
+++ b/hardware/arduino/sam/cores/sam/USB/USBCore.cpp
@@ -79,21 +79,12 @@ const uint16_t STRING_IMANUFACTURER[12] = {
 #define DEVICE_CLASS 0x00
 #endif
 
-//#if defined CDC_ENABLED && defined HID_ENABLED
-//#define USB_PID_FINAL (USB_PID|0x1001UL)
-//#elif defined HID_ENABLED
-//#define USB_PID_FINAL (USB_PID|0x1000UL)
-//#elif defined CDC_ENABLED
-//#define USB_PID_FINAL (USB_PID|0x0001UL)
-//#endif
-#define USB_PID_FINAL USB_PID
-
 //	DEVICE DESCRIPTOR
 const DeviceDescriptor USB_DeviceDescriptor =
-	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID_FINAL,0x100,IMANUFACTURER,IPRODUCT,0,1);
+	D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
 
 const DeviceDescriptor USB_DeviceDescriptorA =
-	D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID_FINAL,0x100,IMANUFACTURER,IPRODUCT,0,1);
+	D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
 
 
 
diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk
index 0df7ea912..520885596 100644
--- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk
+++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk
@@ -73,8 +73,8 @@ endif
 
 include $(TOOLCHAIN).mk
 
-CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
-CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
+CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
+CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
 
 #-------------------------------------------------------------------------------
 ifdef DEBUG
diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk
index e69adcbad..e610a1b9d 100644
--- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk
+++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk
@@ -73,8 +73,8 @@ endif
 
 include $(TOOLCHAIN).mk
 
-CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
-CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
+CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
+CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
 
 #-------------------------------------------------------------------------------
 ifdef DEBUG
diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk
index ad7b9f480..0a71c2f31 100644
--- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk
+++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk
@@ -73,8 +73,8 @@ endif
 
 include $(TOOLCHAIN).mk
 
-CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
-CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe
+CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
+CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
 
 #-------------------------------------------------------------------------------
 ifdef DEBUG
diff --git a/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a b/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a
index 88d9d7bea..ad30b43b3 100644
Binary files a/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a and b/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a differ
diff --git a/hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp b/hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp
index 6df7ee14c..ebb27d07b 100644
--- a/hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp
+++ b/hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp
@@ -19,51 +19,14 @@
 #include "variant.h"
 #include <stdio.h>
 
-// set pin numbers for the five buttons:
-const int upButton = 2;
-const int downButton = 3;
-const int leftButton = 4;
-const int rightButton = 5;
-const int mouseButton = 6;
-
-int range = 5;              // output range of X or Y movement; affects movement speed
-int responseDelay = 10;     // response delay of the mouse, in ms
-
-/*
 void setup() {
+	Serial.begin(57600);
 	Mouse.begin();
 }
 
 void loop() {
-	Mouse.move(10, 0, 0);
-	delay(1000);
-}
-*/
 
-
-/*
-void setup() {
-	// initialize the digital pin as an output.
-	// Pin 13 has an LED connected on most Arduino boards:
-	//pinMode(13, OUTPUT);
-	Serial1.begin(115200) ;
-	printf("USB test starting...\r\n");
-}
-
-void loop() {
-	//digitalWrite(13, HIGH);   // set the LED on
-	//delay(1000);              // wait for a second
-	//digitalWrite(13, LOW);    // set the LED off
-	delay(1000);              // wait for a second
-	printf("loop...\r\n");
-}
-*/
-
-void setup() {
-	Serial.begin(57600);
-}
-
-void loop() {
+	Mouse.move(1, 0, 0);
 
 	if (Serial.available() > 0)
 	{
@@ -73,4 +36,3 @@ void loop() {
 	}
 	delay(10);
 }
-
diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a
index 4a27d212b..00960209f 100644
Binary files a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a and b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a differ