diff --git a/build/linux/arduino.1 b/build/linux/arduino.1
new file mode 100644
index 00000000000..129daade25b
--- /dev/null
+++ b/build/linux/arduino.1
@@ -0,0 +1,13 @@
+.TH ARDUINO 1 "30 September 2010"
+.SH NAME
+arduino \- An IDE for Arduino-compatible electronics prototyping platforms
+.SH SYNOPSIS
+arduino
+.SH DESCRIPTION
+The Arduino development environment consists of a text editor, example
+code, and tools for compiling and uploading code to Arduino and
+compatible microcontroller boards.
+.SH SEE ALSO
+/usr/share/arduino/reference/index.html, http://arduino.cc/
+.SH AUTHOR
+Peter Oliver <arduino@mavit.org.uk>
diff --git a/build/linux/arduino.desktop b/build/linux/arduino.desktop
new file mode 100644
index 00000000000..45ceaf97c85
--- /dev/null
+++ b/build/linux/arduino.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Arduino
+Comment=An IDE for Arduino-compatible electronics prototyping platforms
+Exec=arduino
+Icon=arduino
+Terminal=false
+Categories=Development;IDE;Electronics;
diff --git a/build/linux/icons/128x128/arduino.png b/build/linux/icons/128x128/arduino.png
new file mode 100644
index 00000000000..28fa03ab7f7
Binary files /dev/null and b/build/linux/icons/128x128/arduino.png differ
diff --git a/build/linux/icons/16x16/arduino.png b/build/linux/icons/16x16/arduino.png
new file mode 100644
index 00000000000..6ef4a2bdf01
Binary files /dev/null and b/build/linux/icons/16x16/arduino.png differ
diff --git a/build/linux/icons/24x24/arduino.png b/build/linux/icons/24x24/arduino.png
new file mode 100644
index 00000000000..7b2e7a5c306
Binary files /dev/null and b/build/linux/icons/24x24/arduino.png differ
diff --git a/build/linux/icons/256x256/arduino.png b/build/linux/icons/256x256/arduino.png
new file mode 100644
index 00000000000..e7f6638e021
Binary files /dev/null and b/build/linux/icons/256x256/arduino.png differ
diff --git a/build/linux/icons/32x32/arduino.png b/build/linux/icons/32x32/arduino.png
new file mode 100644
index 00000000000..74eacaa240b
Binary files /dev/null and b/build/linux/icons/32x32/arduino.png differ
diff --git a/build/linux/icons/48x48/arduino.png b/build/linux/icons/48x48/arduino.png
new file mode 100644
index 00000000000..dcfbed45c5b
Binary files /dev/null and b/build/linux/icons/48x48/arduino.png differ