diff --git a/libraries/Temboo/keywords.txt b/libraries/Temboo/keywords.txt
new file mode 100644
index 000000000..53af447af
--- /dev/null
+++ b/libraries/Temboo/keywords.txt
@@ -0,0 +1,30 @@
+#######################################
+# Syntax Coloring Map Temboo
+#######################################
+
+#######################################
+# Class (KEYWORD3)
+#######################################
+
+Temboo	KEYWORD3
+
+#######################################
+# Datatypes (KEYWORD2)
+#######################################
+
+TembooChoreo	KEYWORD2
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+begin	KEYWORD2
+setAccountName	KEYWORD2
+setAppKeyName	KEYWORD2
+setAppKey	KEYWORD2
+setChoreo	KEYWORD2
+setCredential	KEYWORD2
+addInput	KEYWORD2
+addOutputFilter	KEYWORD2
+setSettingsFileToWrite	KEYWORD2
+setSettingsFileToRead	KEYWORD2
diff --git a/libraries/Temboo/library.properties b/libraries/Temboo/library.properties
new file mode 100644
index 000000000..7b33690be
--- /dev/null
+++ b/libraries/Temboo/library.properties
@@ -0,0 +1,10 @@
+name=Temboo
+author=Temboo
+email=hey@temboo.com
+sentence=This is the library to use the Temboo Choreos with the Arduino Yun.
+paragraph=Temboo is a platworm that provides a normalized access to a lot of web services. This library enable the Yun to connect to Temboo  and use their APIs are called Choreos.
+url=http://www.temboo.com
+architectures=avr
+version=1.0
+dependencies=
+core-dependencies=arduino (>=1.5.0)
diff --git a/hardware/arduino/avr/libraries/Temboo/Temboo.cpp b/libraries/Temboo/src/Temboo.cpp
similarity index 100%
rename from hardware/arduino/avr/libraries/Temboo/Temboo.cpp
rename to libraries/Temboo/src/Temboo.cpp
diff --git a/hardware/arduino/avr/libraries/Temboo/Temboo.h b/libraries/Temboo/src/Temboo.h
similarity index 100%
rename from hardware/arduino/avr/libraries/Temboo/Temboo.h
rename to libraries/Temboo/src/Temboo.h