diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index 4f1c6f669..b8aadc6ba 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,9 +1,109 @@
-Version 2.0.9
+Version 2.1.0 / (set date)
-- Taranis is now the default board in General Settings
+- SD card synchronizaton tool
-Version 2.0.8
+
+Version 2.0.18 / (not yet released)
+
+- Enabled Mixers monitor in Taranis simulator
+- Better support for multi-axes in Log Viewer (#2267)
+- File path issue in Taranis simulator function findTrueFileName() on Windows (#2301)
+- Added simulator volume gain setting (#2260)
+- Added GPS glitch filtering and Latitude/Longitude position synchronization to Google Earth export (#2326)
+
+
+
+
+Version 2.0.17 / 2015-05-04
+
+- Simulator crash (#2253)
+
+
+
+Version 2.0.16 / 2015-05-03
+
+- nooverridech firmware option was not working
+- Fixed setting Expo from gvars for 9XR-Pro (#2040)
+- Added Mixers Monitor screen option mixersmon (#1945)
+- Added audio playing in simulator (#457)
+- Fixed sorting of audio tracks (#2002)
+- Model wizard fixes (#2091)
+- GVAR names removed for 9x, radio doesn't support them (#2150)
+- Some LS sources didn't follow the Imperial units setting (#2180)
+- Added more fields to the telemetry simulator (#2171)
+- Log viewer improvements and massive speed increase (#1863, #2163)
+- Added Battery meter range setting (#2195)
+- Improvements in Print and Compare dialogs (#2219)
+- Reset pots to the middle by right double clicking them in Simulator (#1939)
+- Minor fixes: #2153,
+ #2138,
+ #2090,
+ #2122
+
+
+
+
+Version 2.0.15 / 2015-01-13
+
+- Firmware was not written correctly on radio when compatibility warning check enabled
+- Time format for Special Functions Set Timers
+
+
+Version 2.0.14 / 2015-01-12
+
+- OpenTX Companion and Companion9x can now be installed side by side on Linux
+- Improved TAB order in dialogs
+- Special Function Start Logs renamed to more appropriate SD Logs
+- Improvements for MAC build
+- Fixes to Google Earth logs export
+- Firmware compatibility warning check added when flashing new firmware to radio
+- Fixed issue with Telemetry Type setting on 9XR-PRO
+- Added Telemetry simulator
+- Added Trainer simulator
+- Added Debug Output window
+- Various texts and translations corrections
+- Various small bug-fixes
+- More reliable method of writing EEPROM.BIN and FIRMWARE.BIN to radio
+- Fixed issue with Edge function INSTANT for V1>2s
+- Fixed buffer overflow in Joystick code
+
+
+Version 2.0.13 / 2014-11-20
+
+- Too many curves shown on non ARM boards
+- Fixed vario limits
+- Fixes in compare dialog
+- Fixed receiver number range
+- Virtual inputs not selectable in SF Volume and heli Collective Source
+- Joystick calibration crash after channel assignment
+- Gvar import error for limits
+- Companion shows too many curve types in input/mixer for 9x
+- NOT curves removed from inputs (for non ARM platforms)
+- Companion again builds on OS X (Mac)
+- Companion simulator Lua crash on OS X 64bit (Mac)
+- Companion didn't take care of PlayScript functions
+
+
+Version 2.0.12 / 2014-09-15
+
+- Typos & Translations updated
+
+
+Version 2.0.11 / 2014-09-10
+
+- Limits EEPROM export was broken (all boards except Taranis)
+- Fix issue when a GVAR was used as Offset
+
+
+Version 2.0.10 / 2014-09-08
+
+- Taranis is now the default board in General Settings
+- GVARS allowed in Limits min/max/offset
+- Limits displayed in us when ppmus option selected
+
+
+Version 2.0.8 / 2014-07-23
- Compare dialog bugfixes
- Curve index correctly resetted when type changed
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
index 1b331e0ce..ecdcd0d59 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -1,3 +1,146 @@
+Version 2.1.0 / (set date)
+
+
+- New Telemetry system
+- Added optional alternative memory allocator for LUA (Bin Allocator)
+- Added support for Taranis 9XE (tray version)
+- New dangerous Custom Functions
+- Added another timer (Timer3)
+
+
+
+Version 2.0.18 / (not yet released)
+
+[Taranis]
+
+- Lua model.insertInput() could not add more than 32 inputs (#2084)
+- Fixed auto-source problem on radios with non-existing S3 pot (#2364)
+
+
+[ARM Boards]
+
+- Fixed Edge Logical switch erroneous delay (#2368)
+
+
+Version 2.0.17 / 2015-05-04
+
+Nothing new (only Companion fixes)
+
+
+Version 2.0.16 / 2015-05-03
+
+[Taranis]
+
+- Fixed reverse polarity on external PPM output. Users with external module in PPM mode should check and update PPM polarity setting.
+- File deletion in SD manager did not free used clusters (all radios with SD card)
+- Fixed Lua lcd.drawLine() problem with slanted lines
+- Fixed bad SWR after flight or telemetry reset (#2015)
+- Fixed missing timer voice minute call when triggered by THt (#2009)
+- Lua model.insertInput() could not add a line to an empty input or at the end of the existing input lines (#2084)
+- Fixed radio slowdown when SD card was full (#2007)
+- Added Mixers Monitor screen (#1945)
+- Fixed Lua lcd.drawPixmap() that could write outside the LCD buffer (#2123)
+- Gps positon display fixed: fractional seconds lacked leading zeros (#2144)
+- More memory available for Lua scripts (#2050)
+- Various texts and translations corrections
+- Telemetry bars title fix (#2203)
+
+
+[Bootloader]
+- Fixed USB access problem with SD cards larger than 4GB (#2154)
+
+
+Version 2.0.15 / 2015-01-13
+
+Nothing new (only Companion fixes)
+
+
+Version 2.0.14 / 2015-01-12
+
+[Taranis]
+
+- Fixed blank LCD screen at very low temperatures
+- Shortened radio reboot time in case of watchdog reset
+- Fixed timer problem in bootloader, which prevented radio from powering off after being connected to USB
+- Fixed issue with heli swash plate mixing when using notrim
+- Various fixes for double-keys
+- Added switch auto detection in Timer source
+- Totally removed splash screen display if duration is set to ---
+- Back-light turned on sooner at startup (Taranis +)
+Fixed reverse polarity on external CPPM output (update: this was not fixed in 2.0.14)- Suppressed center beep for non-existing pots
+- Fixed THt persistent timer running after model load (with Throttle at -100%)
+- Fixed buffer overflow for automatic flight mode change audio announcements (if very long model and flight mode names were used)
+- Limited stick throws to 100% when using trainer in add mode
+- Fixed Lua lcd.drawLine(), first pixel was not drawn
+- Fixed missing last column for some bitmap sizes
+- Minor display corrections
+
+
+[9XR-PRO]
+
+
+[9XR]
+
+- Added 115200 bps speed to MAVLINK
+
+
+[9X2561]
+
+
+[All]
+
+- Various texts and translations corrections
+- Various small bug-fixes
+
+
+
+Version 2.0.13 / 2014-11-20
+[Taranis]
+
+- Compilation with -Os instead of -O2 because of a strange bug on LS1 (AND condition changed by itself on SD error)
+- Lua getTimer and setTimer parameters fixed (persistent and minuteBeep)
+- Lua resetTimer function added
+- SWR shown on newer Taranis+
+- BOLD, CONDENSED, FIXED constants exported to Lua
+- Disable mixer line that uses a Lua source if the Lua script is not running
+- Additional parameters for Lua model.getMix/insertMix
+- Fixed occasional SD card error
+- Fixed bitmap loading
+
+
+[9XR-PRO]
+
+- Coprocessor interface bugfix
+
+
+[Stock]
+
+- Fixed never ending haptic repeat
+- Fixed curves display
+
+
+[All]
+
+- Stick icons missing next to trim key states on switch diag page
+
+
+
+Version 2.0.12 / 2014-09-16
+[Taranis]
+
+- LTR patch (modified) applied to the Lua code. Saves around 8-10k RAM
+- Lua hardening again!
+- bit32 lib added to the Lua interpreter
+- Audio tones distorsion (just after playing a wav file)
+- ABS changed to ON in Timers modes
+- S2 and S3 pots inverted on Taranis+
+
+
Version 2.0.11 / 2014-09-10
[9XR-PRO]