diff --git a/hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp b/libraries/EEPROM/arch/avr/EEPROM.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp
rename to libraries/EEPROM/arch/avr/EEPROM.cpp
diff --git a/hardware/arduino/avr/libraries/EEPROM/EEPROM.h b/libraries/EEPROM/arch/avr/EEPROM.h
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/EEPROM.h
rename to libraries/EEPROM/arch/avr/EEPROM.h
diff --git a/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino b/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
rename to libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino
diff --git a/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino b/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
rename to libraries/EEPROM/examples/eeprom_read/eeprom_read.ino
diff --git a/hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino b/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
rename to libraries/EEPROM/examples/eeprom_write/eeprom_write.ino
diff --git a/hardware/arduino/avr/libraries/EEPROM/keywords.txt b/libraries/EEPROM/keywords.txt
similarity index 100%
rename from hardware/arduino/avr/libraries/EEPROM/keywords.txt
rename to libraries/EEPROM/keywords.txt
diff --git a/libraries/EEPROM/library.properties b/libraries/EEPROM/library.properties
new file mode 100644
index 000000000..f02967658
--- /dev/null
+++ b/libraries/EEPROM/library.properties
@@ -0,0 +1,10 @@
+name=EEPROM
+author=David A. Mellis
+email=info@arduino.cc
+sentence=The libary to read/write the EEPROM memory on the AVR-based Arduino boards.
+paragraph=With this library you can read and write bytes to the EEPROM memory, that is available on the AVR microcontrollers mounted on the Arduino boards.
+url=http://arduino.cc/en/Reference/EEPROM
+architectures=avr
+version=1.0
+dependencies= none
+core-dependencies=arduino (>=1.5.0)