diff --git a/build/linux/dist/arduino.desktop b/build/linux/dist/arduino.desktop
new file mode 100644
index 00000000000..dac3ebd9d68
--- /dev/null
+++ b/build/linux/dist/arduino.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Arduino IDE
+GenericName=Integrated Development Environment
+Comment=An IDE for Arduino-compatible electronics prototyping platforms
+Exec=arduino
+Icon=arduino
+Terminal=false
+Categories=Development;IDE;Electronics;
+MimeType=text/x-arduino
+Keywords=embedded electronics;electronics;avr;microcontroller;
diff --git a/build/linux/dist/mime.xml b/build/linux/dist/mime.xml
new file mode 100644
index 00000000000..098fd9426be
--- /dev/null
+++ b/build/linux/dist/mime.xml
@@ -0,0 +1,42 @@
+
+
+
+ Arduino source code
+ شفرة مصدر Arduino
+ Kryničny kod Arduino
+ Изходен код на Arduino
+ codi font en Arduino
+ Arduinokildekode
+ Arduino-Quelltext
+ πηγαίος κώδικας Arduino
+ Arduino source code
+ Arduino-fontkodo
+ código fuente en Arduino
+ Arduino iturburu-kodea
+ Arduino-lähdekoodi
+ code source Arduino
+ cód foinseach Arduino
+ Arduino-forráskód
+ Kode program Arduino
+ Codice sorgente Arduino
+ Arduino ソースコード
+ Arduino pradinis kodas
+ Arduino pirmkods
+ Kod sumber Arduino
+ Arduino-kildekode
+ Arduino-broncode
+ Arduino-kjeldekode
+ Kod źródłowy Arduino
+ código fonte Arduino
+ Código fonte Arduino
+ исходный код Arduino
+ Kod burues Arduino
+ Arduino-källkod
+ Вихідний код на мові Arduino
+ Mã nguồn Arduino
+ Arduino 源代码
+ Arduino 源代碼
+
+
+
+
diff --git a/build/shared/icons/128x128/apps/arduino.png b/build/shared/icons/128x128/apps/arduino.png
new file mode 100644
index 00000000000..28fa03ab7f7
Binary files /dev/null and b/build/shared/icons/128x128/apps/arduino.png differ
diff --git a/build/shared/icons/16x16/apps/arduino.png b/build/shared/icons/16x16/apps/arduino.png
new file mode 100644
index 00000000000..6ef4a2bdf01
Binary files /dev/null and b/build/shared/icons/16x16/apps/arduino.png differ
diff --git a/build/shared/icons/24x24/apps/arduino.png b/build/shared/icons/24x24/apps/arduino.png
new file mode 100644
index 00000000000..7b2e7a5c306
Binary files /dev/null and b/build/shared/icons/24x24/apps/arduino.png differ
diff --git a/build/shared/icons/256x256/apps/arduino.png b/build/shared/icons/256x256/apps/arduino.png
new file mode 100644
index 00000000000..e7f6638e021
Binary files /dev/null and b/build/shared/icons/256x256/apps/arduino.png differ
diff --git a/build/shared/icons/32x32/apps/arduino.png b/build/shared/icons/32x32/apps/arduino.png
new file mode 100644
index 00000000000..74eacaa240b
Binary files /dev/null and b/build/shared/icons/32x32/apps/arduino.png differ
diff --git a/build/shared/icons/48x48/apps/arduino.png b/build/shared/icons/48x48/apps/arduino.png
new file mode 100644
index 00000000000..dcfbed45c5b
Binary files /dev/null and b/build/shared/icons/48x48/apps/arduino.png differ
diff --git a/build/shared/icons/arduino.xpm b/build/shared/icons/arduino.xpm
new file mode 100644
index 00000000000..3d84b1ebea8
--- /dev/null
+++ b/build/shared/icons/arduino.xpm
@@ -0,0 +1,292 @@
+/* XPM */
+static char * arduino_xpm[] = {
+"32 32 257 2",
+" c None",
+". c #02797E",
+"+ c #057C81",
+"@ c #097D82",
+"# c #239095",
+"$ c #43A6AA",
+"% c #51B1B5",
+"& c #61BCC0",
+"* c #5EBCBF",
+"= c #61BDC0",
+"- c #51B3B6",
+"; c #43A8AC",
+"> c #239196",
+", c #097E82",
+"' c #0B7E83",
+") c #3CA0A4",
+"! c #59B8BC",
+"~ c #3FAFB4",
+"{ c #1FA4A9",
+"] c #109EA4",
+"^ c #00989E",
+"/ c #1FA4AA",
+"( c #3FB1B5",
+"_ c #5ABABE",
+": c #3CA1A6",
+"< c #0C7F83",
+"[ c #31989C",
+"} c #55B4B8",
+"| c #26A6AB",
+"1 c #01989E",
+"2 c #00999F",
+"3 c #009AA0",
+"4 c #009AA1",
+"5 c #26A7AC",
+"6 c #54B6BB",
+"7 c #319A9E",
+"8 c #087C81",
+"9 c #44A2A7",
+"0 c #31A7AC",
+"a c #03989E",
+"b c #009BA1",
+"c c #009CA2",
+"d c #009CA3",
+"e c #009DA3",
+"f c #03999F",
+"g c #31ABB0",
+"h c #47A6AA",
+"i c #0A7D82",
+"j c #4CA6AB",
+"k c #1EA0A5",
+"l c #009EA4",
+"m c #009EA5",
+"n c #009FA5",
+"o c #1BA3A8",
+"p c #4CA9AD",
+"q c #047A7F",
+"r c #43A1A5",
+"s c #129A9F",
+"t c #009FA6",
+"u c #00A0A6",
+"v c #00A1A7",
+"w c #00A1A8",
+"x c #129FA5",
+"y c #43A4A8",
+"z c #369499",
+"A c #1B9BA0",
+"B c #00979D",
+"C c #009DA4",
+"D c #00A0A7",
+"E c #00A2A9",
+"F c #00A3A9",
+"G c #00A3AA",
+"H c #00A4AA",
+"I c #1BA1A7",
+"J c #379599",
+"K c #1B8489",
+"L c #2D999E",
+"M c #00969C",
+"N c #00A4AB",
+"O c #00A5AC",
+"P c #00A6AC",
+"Q c #00A6AD",
+"R c #2C9EA3",
+"S c #1A8488",
+"T c #3A989C",
+"U c #019197",
+"V c #00A7AD",
+"W c #00A8AE",
+"X c #00A8AF",
+"Y c #3B9A9E",
+"Z c #1D8488",
+"` c #1C9095",
+" . c #00959B",
+".. c #40B6BA",
+"+. c #AFE1E3",
+"@. c #EFF9FA",
+"#. c #FFFFFF",
+"$. c #DFF4F4",
+"%. c #9FDDE0",
+"&. c #20B4B9",
+"*. c #00AAB0",
+"=. c #00AAB1",
+"-. c #00ABB1",
+";. c #20B5BA",
+">. c #9FDEE1",
+",. c #DFF4F5",
+"'. c #AFE2E4",
+"). c #40B7BC",
+"!. c #1B9499",
+"~. c #1F8589",
+"{. c #359296",
+"]. c #008A90",
+"^. c #9FDADC",
+"/. c #EFFAFA",
+"(. c #61CBCE",
+"_. c #01ABB2",
+":. c #01ACB2",
+"<. c #61CBCF",
+"[. c #9FDADD",
+"}. c #009197",
+"|. c #359295",
+"1. c #268C90",
+"2. c #70C6CA",
+"3. c #BFE6E8",
+"4. c #50BCC1",
+"5. c #40B8BC",
+"6. c #60C6C9",
+"7. c #60C7CB",
+"8. c #40B9BE",
+"9. c #50BEC2",
+"0. c #BFE7E8",
+"a. c #70C7CB",
+"b. c #128388",
+"c. c #009399",
+"d. c #EFF9F9",
+"e. c #9FD9DB",
+"f. c #009BA2",
+"g. c #11A9AE",
+"h. c #BFE9EA",
+"i. c #BFE9EB",
+"j. c #11AAB0",
+"k. c #11A8AD",
+"l. c #10A4AA",
+"m. c #13868A",
+"n. c #037D82",
+"o. c #00949A",
+"p. c #40B1B6",
+"q. c #109EA3",
+"r. c #109EA5",
+"s. c #40B4B9",
+"t. c #40B6BC",
+"u. c #11A7AD",
+"v. c #11A9AF",
+"w. c #CFEEF0",
+"x. c #11ABB1",
+"y. c #11A8AE",
+"z. c #71CACE",
+"A. c #10A1A7",
+"B. c #109FA6",
+"C. c #40B3B8",
+"D. c #037F84",
+"E. c #027D82",
+"F. c #40B0B5",
+"G. c #BFE4E6",
+"H. c #00969D",
+"I. c #40B3B7",
+"J. c #41B9BD",
+"K. c #01A2A8",
+"L. c #61C6CA",
+"M. c #61C7CB",
+"N. c #01A3AA",
+"O. c #41B9BE",
+"P. c #40B3B9",
+"Q. c #BFE5E7",
+"R. c #40B2B6",
+"S. c #00989F",
+"T. c #027F85",
+"U. c #027C81",
+"V. c #40AFB3",
+"W. c #109DA2",
+"X. c #40B5B9",
+"Y. c #40B8BD",
+"Z. c #CFEDEF",
+"`. c #70C8CB",
+" + c #10A0A6",
+".+ c #40B0B6",
+"++ c #027D83",
+"@+ c #027A7F",
+"#+ c #EFF8F9",
+"$+ c #9FD7DA",
+"%+ c #00A2A8",
+"&+ c #BFE7E9",
+"*+ c #BFE8E9",
+"=+ c #9FD8DA",
+"-+ c #02757A",
+";+ c #008D93",
+">+ c #70C2C5",
+",+ c #50BBC0",
+"'+ c #60C4C8",
+")+ c #DFF3F4",
+"!+ c #61C3C6",
+"~+ c #50BCC0",
+"{+ c #BFE6E7",
+"]+ c #70C3C6",
+"^+ c #009298",
+"/+ c #026A6F",
+"(+ c #01848A",
+"_+ c #9FD6D8",
+":+ c #019CA3",
+"<+ c #019DA3",
+"[+ c #9FD7D9",
+"}+ c #018A8F",
+"|+ c #017D82",
+"1+ c #40AEB3",
+"2+ c #AFDEE0",
+"3+ c #DFF3F3",
+"4+ c #20A9AF",
+"5+ c #40AFB4",
+"6+ c #017F85",
+"7+ c #027479",
+"8+ c #00898F",
+"9+ c #00979E",
+"0+ c #0099A0",
+"a+ c #00939A",
+"b+ c #018D92",
+"c+ c #027378",
+"d+ c #017E84",
+"e+ c #018085",
+"f+ c #027075",
+"g+ c #018288",
+"h+ c #00949B",
+"i+ c #00959C",
+"j+ c #01868B",
+"k+ c #027074",
+"l+ c #01878C",
+"m+ c #018A90",
+"n+ c #02787D",
+"o+ c #01888E",
+"p+ c #018C91",
+"q+ c #02777C",
+"r+ c #01858B",
+"s+ c #027176",
+"t+ c #009196",
+"u+ c #009398",
+"v+ c #01858A",
+"w+ c #015A5E",
+"x+ c #02767B",
+"y+ c #018086",
+"z+ c #00959A",
+"A+ c #018C92",
+"B+ c #018287",
+"C+ c #015B5E",
+"D+ c #027E83",
+"E+ c #018388",
+"F+ c #027E84",
+"G+ c #026B70",
+"H+ c #01565A",
+" . . . + + . . . ",
+" . @ # $ % & * * = - ; > , . ",
+" ' ) ! ~ { ] ^ ^ ^ ^ ] / ( _ : < ",
+" . [ } | 1 ^ 2 3 3 3 4 3 3 3 2 ^ 5 6 7 . ",
+" 8 9 0 a ^ 2 3 b c c d e d c c b 3 2 f g h 8 ",
+" i j k ^ 2 3 b c e l m n n n m l e c b 3 2 o p i ",
+" q r s ^ 2 3 c e l t u v v w v v u t l e c 3 2 x y q ",
+" z A B 2 3 c C n D w E F G H G F E w D n C c 3 2 I J ",
+" K L M ^ 3 c C n v E G N O P Q P O N G E v n C c 3 ^ R S ",
+" T U ^ 2 b e n v E N O V W X X X W V O N E v n e b 2 1 Y ",
+" Z ` .^ 3 c ..+.@.#.$.%.&.*.=.-.=.;.>.,.#.@.'.).l c 3 ^ !.~. ",
+" {.].B 2 3 ^.#.#.#.#.#.#./.(._.:.<./.#.#.#.#.#.#.[.c b 2 }.|. ",
+" 1.}.^ 2 2.#.#.3.4.5.6.$.#.#.<.<.#.#.,.7.8.9.0.#.#.a.b 3 ^ 1. ",
+" b.c.B ^ d.#.e.3 f.l u g.h.#.#.#.#.i.j.k.5.l.d ^.#.d.3 2 ^ m. ",
+" n.o.M p.#.#.q.r.s...t.u.v.w.#.#.w.x.y.z.#.a.A.B.#.#.C.^ ^ D. ",
+" E.c.M F.#.G.H.I.#.#.#.J.K.L.#.#.M.N.O.#.#.#.P.^ Q.#.R.S.B T. ",
+" U.c. .V.#.#.W.r.X.).Y.u.k.Z.#.#.Z.v.y.z.#.`. +] #.#..+B B ++ ",
+" @+}.o.c.#+#.$+3 C u %+k.&+#.#.#.#.*+y.u.5.l.4 =+#.#+ .M M @+ ",
+" -+;+o.c.>+#.#.Q.,+5.'+)+#.#.!+!+#.#.)+'+).~+{+#.#.]+ .M ^+-+ ",
+" /+(+c.^+}._+#.#.#.#.#.#.d.!+:+<+!+d.#.#.#.#.#.#.[+c.o. .}+/+ ",
+" |+^+^+}.}.1+2+d.#.3+^.4+c f.c d 4+^.3+#.d.2+5+c.c.o. .6+ ",
+" 7+8+c.}.}.^+o.M 9+0+0+b c d d d c b 0+S.H. .a+c.c.o.b+c+ ",
+" d+c.c.^+^+a+o.M 9+S.4 d e C e f.0+S.H. .o.a+o. . .e+ ",
+" f+g+o.o.c.o.h+i+9+0+f.e m n C c 0+S.H.i+i+ . .M j+k+ ",
+" 7+l+ . . .M B ^ 4 c l n t l e b 0+^ B B M M m+7+ ",
+" n+o+M M B ^ 2 3 c C l l l d b 3 2 ^ B B p+n+ ",
+" q+r+M B ^ 2 3 c c d e d c b 3 2 ^ B o+q+ ",
+" s+g+t+^ ^ 2 3 3 3 4 3 3 3 2 ^ u+v+s+ ",
+" w+x+y+m+z+^ ^ ^ ^ ^ ^ M A+B+x+C+ ",
+" /+q+E.D+E+E+F+E.q+G+ ",
+" H+H+ ",
+" "};
diff --git a/build/shared/manpage.adoc b/build/shared/manpage.adoc
new file mode 100644
index 00000000000..3f348d95eac
--- /dev/null
+++ b/build/shared/manpage.adoc
@@ -0,0 +1,209 @@
+// Generate a manpage with: a2x -f manpage manpage.adoc
+// or HTML with: a2x -f xhtml manpage.adoc
+//
+// This file uses {empty}:: in some places, to allow putting multiple
+// paragraphs inside a single label list item. This is a bit ugly and
+// non-semantic, but it seems this is the best way to do this. Asciidoc
+// also supports putting a plus sign on a line by itself to join two
+// paragraphs into a single list item. However, the indentation on the
+// second paragraph makes that formatted with a fixed-size font.
+// Removing the indentation completely makes the asciidoc source very
+// unreadable. Also, for the --board option, there is a a paragraph,
+// followed by a list, followed by another paragraph. The + approach can
+// only put the latter paragraph into the inner list, not the outer
+// one...
+
+ARDUINO(1)
+==========
+:doctype: manpage
+
+NAME
+----
+arduino - Integrated development environment for Arduino boards
+
+SYNOPSIS
+--------
+*arduino* ['FILE.ino'...]
+
+*arduino* [*--verify*|*--upload*] [*--board* __package__:__arch__:__board__[:__parameters__]] [*--port* __portname__] [*--pref* __name__=__value__] [*-v*|*--verbose*] [__FILE.ino__]
+
+DESCRIPTION
+-----------
+The 'arduino' integrated development environment allows editing,
+compiling and uploading sketches (programs) for Arduino
+(and compatible) microcontroller boards.
+
+Normally, running the arduino command starts the IDE, optionally loading
+any .ino files specified on the commandline.
+
+Alternatively, if *--verify* or *--upload* is given, no graphical
+interface will be shown and instead a one-off verify (compile) or upload
+will be done. A single .ino file should be given. If the sketch contains
+multiple .ino files, any one can be specified on the commandline, but
+the entire sketch will be compiled.
+
+When running in a one-off mode, it might be useful to set the
+*build.path* preference to allow keeping intermediate build results
+between multiple runs and only recompile the files that changed.
+
+Note that on MacOS X, the main executable is
+'Arduino.app/Contents/MacOS/JavaApplicationStub' instead of 'arduino'.
+
+OPTIONS
+-------
+*--board* __package__:__arch__:__board__[:__parameters__]::
+ Select the board to compile for.
+
+ * __package__ is the identifier of the vendor (the first
+ level folders inside the 'hardware' directory). Default
+ arduino boards use 'arduino'.
+ * __architecture__ is the architecture of the board (second level folders
+ inside the 'hardware' directory). Default arduino boards use
+ either *arduino:avr* for all AVR-based boards (like Uno, Mega
+ or Leonardo) or *arduino:sam* for 32bit SAM-based boards
+ (like Arduino Due).
+ * __board__ is the actual board to use, as defined in 'boards.txt'
+ contained in the architecture folder selected. For example,
+ *arduino:avr:uno* for the Arduino Uno,
+ *arduino:avr:diecimila* for the Arduino Duemilanove or
+ Diecimila, or *arduino:avr:mega* for the Arduino Mega.
+ * __parameters__ is a comma-separated list of boards specific parameters
+ that are normally shown under submenus of the "Tools" menu. For
+ example *arduino:avr:nano:cpu=atmega168* to Select the mega168
+ variant of the Arduino Nano board.
+
+{empty}::
+ If this option is not passed, the value from the current
+ preferences is used (e.g., the last board selected in the IDE).
+
+*--port* __portname__::
+ Select the serial port to perform upload of the sketch.
+ On linux and MacOS X, this should be the path to a device file (e.g.,
+ */dev/ttyACM0*). On Windows, this should be the name of the serial
+ port (e.g., *COM3*).
+
+{empty}::
+ If this option is not passed, the value from the current
+ preferences is used (e.g., the last port selected in the IDE).
+
+*-v, --verbose*::
+
+ Enable verbose mode during build and upload. If this option is
+ not given, verbose mode is disabled regardless of the current
+ preferences.
+
+*--pref* __name__=__value__::
+ Sets the preference __name__ to the given __value__.
+
+{empty}::
+ Currently the preferences set are saved to 'preferences.txt', but
+ this might change in the future (making them only active during
+ the current invocation).
+
+{empty}::
+ Note that the preferences you set with this option are not
+ validated: Invalid names will be set but never used, invalid
+ values might lead to an error later on.
+
+*--upload*::
+ Build and upload the sketch.
+
+*--verify*::
+ Build the sketch.
+
+PREFERENCES
+-----------
+Arduino keeps a list of preferences, as simple name and value pairs.
+Below, a few of them are documented but a lot more are available.
+
+*sketchbook.path*::
+ The path where sketches are (usually) stored. This path can also
+ contain some special subdirectories (see FILES below).
+
+*update.check*::
+ When set to true, the IDE checks for a new version on startup.
+
+*editor.external*::
+ When set to true, use an external editor (the IDE does not allow
+ editing and reloads each file before verifying).
+
+*build.path*::
+ The path to use for building. This is where things like the
+ preprocessed .cpp file, compiled .o files and the final .hex
+ file go.
+
+{empty}::
+ If set, this directory should already exist before running the
+ arduino command.
+
+{empty}::
+ If this preference is not set (which is normally the case), a
+ new temporary build folder is created on every run and deleted
+ again when the application is closed.
+
+EXIT STATUS
+-----------
+*0*:: Success
+*1*:: Build failed or upload failed
+*2*:: Sketch not found
+*3*:: Invalid (argument for) commandline option
+
+FILES
+-----
+*~/.arduino15/preferences.txt*::
+ This file stores the preferences used for the IDE, building and
+ uploading sketches.
+
+*My Documents/Arduino/* (Windows)::
+*~/Documents/Arduino/* (Mac OS X)::
+*~/Arduino/* (Linux)::
+ This directory is referred to as the "Sketchbook" and contains
+ the user's sketches. The path can be changed through the
+ *sketchbook.path* preference.
+
+{empty}::
+ Apart from sketches, three special directories can be inside the
+ sketchbook:
+
+ *libraries*:::
+ Libraries can be put inside this directory, one library
+ per subdirectory.
+
+ *hardware*:::
+ Support for third-party hardware can be added through
+ this directory.
+
+ *tools*:::
+ External code-processing tools (that can be run through
+ the Tools menu of the IDE) can be added here.
+
+EXAMPLES
+--------
+
+Start the Arduino IDE, with two files open:
+
+ arduino /path/to/sketch/sketch.ino /path/to/sketch/extra.ino
+
+Compile and upload a sketch using the last selected board and serial port
+
+ arduino --upload /path/to/sketch/sketch.ino
+
+Compile and upload a sketch to an Arduino Nano, with an Atmega168 CPU,
+connected on port '/dev/ttyACM0':
+
+ arduino --board arduino:avr:nano:cpu=atmega168 --port /dev/ttyACM0 --upload /path/to/sketch/sketch.ino
+
+Compile a sketch, put the build results in the 'build' directory an
+re-use any previous build results in that directory.
+
+ arduino --pref build.path=/path/to/sketch/build --verify /path/to/sketch/sketch.ino
+
+RESOURCES
+---------
+Web site:
+
+Help on projects and programming:
+
+Report bugs:
+
+IDE and framework development mailing list:
diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt
index fba55901074..d4a0defd611 100644
--- a/hardware/arduino/avr/boards.txt
+++ b/hardware/arduino/avr/boards.txt
@@ -69,48 +69,48 @@ uno.build.variant=standard
##############################################################
-atmega328diecimila.name=Arduino Duemilanove or Diecimila
+diecimila.name=Arduino Duemilanove or Diecimila
-atmega328diecimila.upload.tool=avrdude
-atmega328diecimila.upload.protocol=arduino
+diecimila.upload.tool=avrdude
+diecimila.upload.protocol=arduino
-atmega328diecimila.bootloader.tool=avrdude
-atmega328diecimila.bootloader.low_fuses=0xFF
-atmega328diecimila.bootloader.unlock_bits=0x3F
-atmega328diecimila.bootloader.lock_bits=0x0F
+diecimila.bootloader.tool=avrdude
+diecimila.bootloader.low_fuses=0xFF
+diecimila.bootloader.unlock_bits=0x3F
+diecimila.bootloader.lock_bits=0x0F
-atmega328diecimila.build.f_cpu=16000000L
-atmega328diecimila.build.board=AVR_DUEMILANOVE
-atmega328diecimila.build.core=arduino
-atmega328diecimila.build.variant=standard
+diecimila.build.f_cpu=16000000L
+diecimila.build.board=AVR_DUEMILANOVE
+diecimila.build.core=arduino
+diecimila.build.variant=standard
## Arduino Duemilanove or Diecimila w/ ATmega328
## ---------------------------------------------
-atmega328diecimila.menu.cpu.atmega328=ATmega328
+diecimila.menu.cpu.atmega328=ATmega328
-atmega328diecimila.menu.cpu.atmega328.upload.maximum_size=30720
-atmega328diecimila.menu.cpu.atmega328.upload.maximum_data_size=2048
-atmega328diecimila.menu.cpu.atmega328.upload.speed=57600
+diecimila.menu.cpu.atmega328.upload.maximum_size=30720
+diecimila.menu.cpu.atmega328.upload.maximum_data_size=2048
+diecimila.menu.cpu.atmega328.upload.speed=57600
-atmega328diecimila.menu.cpu.atmega328.bootloader.high_fuses=0xDA
-atmega328diecimila.menu.cpu.atmega328.bootloader.extended_fuses=0x05
-atmega328diecimila.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
+diecimila.menu.cpu.atmega328.bootloader.high_fuses=0xDA
+diecimila.menu.cpu.atmega328.bootloader.extended_fuses=0x05
+diecimila.menu.cpu.atmega328.bootloader.file=atmega/ATmegaBOOT_168_atmega328.hex
-atmega328diecimila.menu.cpu.atmega328.build.mcu=atmega328p
+diecimila.menu.cpu.atmega328.build.mcu=atmega328p
## Arduino Duemilanove or Diecimila w/ ATmega168
## ---------------------------------------------
-atmega328diecimila.menu.cpu.atmega168=ATmega168
+diecimila.menu.cpu.atmega168=ATmega168
-atmega328diecimila.menu.cpu.atmega168.upload.maximum_size=14336
-atmega328diecimila.menu.cpu.atmega168.upload.maximum_data_size=1024
-atmega328diecimila.menu.cpu.atmega168.upload.speed=19200
+diecimila.menu.cpu.atmega168.upload.maximum_size=14336
+diecimila.menu.cpu.atmega168.upload.maximum_data_size=1024
+diecimila.menu.cpu.atmega168.upload.speed=19200
-atmega328diecimila.menu.cpu.atmega168.bootloader.high_fuses=0xdd
-atmega328diecimila.menu.cpu.atmega168.bootloader.extended_fuses=0x00
-atmega328diecimila.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
+diecimila.menu.cpu.atmega168.bootloader.high_fuses=0xdd
+diecimila.menu.cpu.atmega168.bootloader.extended_fuses=0x00
+diecimila.menu.cpu.atmega168.bootloader.file=atmega/ATmegaBOOT_168_diecimila.hex
-atmega328diecimila.menu.cpu.atmega168.build.mcu=atmega168
+diecimila.menu.cpu.atmega168.build.mcu=atmega168
##############################################################