diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 99c94a45b..e9e394e94 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,4 +1,4 @@
-ARDUINO 1.5.8 BETA - not yet release
+ARDUINO 1.5.8 BETA - not yet released
 
 [ide]
 * Find/Replace over multiple tabs (Erwin Ried, Fulvio Ieva)
@@ -11,6 +11,11 @@ ARDUINO 1.5.8 BETA - not yet release
 * FileIO bridge: fixed wrong return value in File::size() for size >32768
 * Updated Temboo to latest version
 
+The following changes are included also in the (not yet released) Arduino IDE 1.0.6:
+
+[core]
+* avr: Added replacement stub for cstdlib atexit() funciton (Christopher Andrews)
+
 ARDUINO 1.5.7 BETA - 2014.07.07
 
 [core]
@@ -319,6 +324,7 @@ ARDUINO 1.0.6 - not yet released
 * avr: Improved USB-CDC write speed (Justin Rajewski)
 * avr: Improved USB-CDC read code (Paul Brook)
 * avr: Fixed race condition in USB-CDC transmit (Paul Brook)
+* avr: Added replacement stub for cstdlib atexit() funciton (Christopher Andrews)
 * Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo)
 * Backported String class from IDE 1.5.x (Matt Jenkins)
 * Backported Print class from IDE 1.5.x
diff --git a/hardware/arduino/avr/cores/arduino/Arduino.h b/hardware/arduino/avr/cores/arduino/Arduino.h
index 630f0d6d7..ac775f13c 100644
--- a/hardware/arduino/avr/cores/arduino/Arduino.h
+++ b/hardware/arduino/avr/cores/arduino/Arduino.h
@@ -120,6 +120,8 @@ typedef uint8_t byte;
 void init(void);
 void initVariant(void);
 
+int atexit(void (*func)()) __attribute__((weak));
+
 void pinMode(uint8_t, uint8_t);
 void digitalWrite(uint8_t, uint8_t);
 int digitalRead(uint8_t);
diff --git a/hardware/arduino/avr/cores/arduino/main.cpp b/hardware/arduino/avr/cores/arduino/main.cpp
index 091c365fc..a60980da5 100644
--- a/hardware/arduino/avr/cores/arduino/main.cpp
+++ b/hardware/arduino/avr/cores/arduino/main.cpp
@@ -19,6 +19,9 @@
 
 #include <Arduino.h>
 
+//Declared weak in Arduino.h to allow user redefinitions.
+int atexit(void (*func)()) { return 0; }
+
 // Weak empty variant initialization function.
 // May be redefined by variant files.
 void initVariant() __attribute__((weak));