diff --git a/companion/releasenotes.txt b/companion/releasenotes.txt
index fdd0c0b1e..d512caa33 100644
--- a/companion/releasenotes.txt
+++ b/companion/releasenotes.txt
@@ -1,5 +1,74 @@
+Version 2.2.0 / 2017-05-30
+
+Major release! Please see this page for details.
+
+Version 2.1.9 / 2016-09-14
+
+
+- SD sync fixes (#3351)
+- Fixed: Telemetry mode "FrSky D (cable)" choice was missing for Taranis (#3372)
+- Show persistent option only for calculated sensors (#3454)
+- Fixed Flight mode clear command (#3214)
+- Fixed a problem with Rotary encoders linked to flight mode (could freeze Companion) (#3459, #3470)
+- Telemetry simulator improvements: added fuel quantity sensor, increased RPM range (#3505, #3506)
+- Implemented minimal support for the DYI Multimodule (#3526)
+- Fixed: GVar combo-box not being refreshed when GV check-box (re-)selected (#3518)
+- Fixed: Heli inversion not correctly shown/saved from Companion on Radios without virtual inputs (#3510)
+- Implemented print functions for the Heli setup screen (#3554)
+- Fixed: Flight modes linked trims display value (#3547, #3568)
+- Fixed: New model global variables and rotary encoders initialisation (#3473)
+- Fixed: Prevent circular linked global variables and rotary encoders (#3472)
+- Fixed wrong log replay speed issue in Telemetry simulator (#3708)
+- Various texts and translations corrections
+
+
+
+Version 2.1.8 / 2016-04-14
+
+
+- Telemetry Simulator sensor instance number fixed (#3207)
+- Fixed: Throttle Source combo-box was populated multiple times (#3222)
+- RTC option tool-tip corrected (#3225)
+- Fixed: Companion was looking for custom scripts at the wrong place (#3237)
+- Offset displayed in inputs screen (#3248)
+- Import/export handling was broken for Average formula telemetry sensors (#3262)
+- Fixed: Hardware Setup control types and names were not stored in profile (#3260)
+- Fixed voice language list (#3338)
+- Fixed data overflow in Special Functions Override Channel (#3347)
+- Fixed: Sync dialog new line problem (only present for some UI languages) (#3350)
+- Removed a few legacy timer limitations, fix non-working limit (#3301)
+- Default AVR fuse settings changed to disable JTAG interface (#3379)
+- Channel range fix (Start, Channels) in Model Settings, Setup page, int/ext module settings
+- Use friendly GVAR names in dialogs (if available) (#3353)
+- Various texts and translations corrections
+
+
+
+Version 2.1.7 / 2016-01-04
+
+
+- Lua 'execute' failed in non-root directory (in Simulator) (#3024)
+
+- LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant
+- Added Clear option to the flight mode context menu (right click on the Name label) (#3026)
+- New features for Telemetry Simulator: log replay, user friendly sensor values (#3124)
+- Added F7 key to reload LUA permanent scripts in radio simulator (#3141)
+- AR9X firmware flashing fall-back was wrong
+- Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (#3160)
+- Various rounding problem fixed: Telemetry sensor Ratio parameter (#3117),
+ Outputs Sub-trim, Min and Max values (#3156)
+- Fixed: telemetry sensors Ratio and Offset value increment/decrement step (#3121)
+- Hardware/Calibration tab split int two tabs (#2974)
+- Fixed Fahrenheit temperature conversion error (if PREC was not 0) (#3146)
+- Application Setting 'Enable automatic backup before writing firmware' was not saved (#3040)
+- Fixed RPM package problem on Fedora (#3130)
+- Fixed conversion errors when loading 2.0.x EEPE (#3177)
+- Various texts and translations corrections
+
+
+
Version 2.1.6 / 2015-11-11
-[Taranis]
+
- Telemetry custom screen changes didn't emit modified signal (#3029)
- Hide D8/LR12 when eu firmware option is selected
diff --git a/radio/releasenotes.txt b/radio/releasenotes.txt
index 8246af3c6..64b308976 100644
--- a/radio/releasenotes.txt
+++ b/radio/releasenotes.txt
@@ -1,3 +1,156 @@
+Version 2.2.0 / 2017-05-30
+
+Major release! Please see this page for details.
+
+[All]
+
+- Special Function RESET now executes only once on the switch change (#3858)
+
+
+[Taranis]
+
+- Fixed: Radio was reset 20s after USB connection in MASSSTORAGE mode (#3840)
+- Added detailed failure messages to the TX module firmware update function
+
+
+[9XR-PRO]
+
+- DSM protocol fixed (#3628)
+
+
+[Lua]
+
+- Number conversion from floating point to integer now gives the same result on the radio and Companion simulator (#3826)
+
+
+
+Version 2.1.9 / 2016-09-14
+
+[All]
+
+- Fixed: calculated sensors had persistent value set to zero at every shutdown when persistent option was not active (#3454)
+- Show persistent option only for calculated sensors (#3454)
+- Fixed: sensors with active filter had invalid negative values (#3463)
+- Enabled DSM protocols on several raios (#3471)
+- Better representation of negative mixer weight in offset bar widget (#3476)
+- Fixed several bugs in curve preset function (#3451)
+- Fixed flight modes rotary encoders initialization when creating new model (only for radios with rotary encoders) (#3473)
+- Fixed: show value of persistent sensor after power on, before the telemetry is received (#3595)
+- Fixed: LSs weren't selectable as input source (#3632>/a>)
+
+
+
+[Taranis]
+
+- Fixed USB driver changed interrupt grouping which affected interrupt priorities (fix suggested by Michael Blandford), this should fix the SBUS Trainer issue #2999 (#3178)
+- ADC Jitter Filter improvements, option added in Hardware settings to turn it on/off (#3432)
+
+
+[9XR-PRO]
+
+- Fixed: Trainer inputs >TR4 not working (#3203)
+- External module output type setting was not visible
+
+
+[Lua]
+
+- Fixed playTone() crash when called with abnormal parameter values (#3462)
+- Return proper values for `Cels-` and `Cels+` (#2826)
+- Fixed lcd.drawNumber() display when INVERS flag was used (#3569)
+
+
+Version 2.1.8 / 2016-04-14
+
+Notice: EDGE Logical Switch operation has changed. Users should check their setups, if they use EDGE with AND switch.
+This bug was introduced in version 2.1.2 and has been fixed in 2.1.8. (#2939)
+
+[Taranis]
+
+- Improvements of Statistics screen (#3206)
+- Flight Modes screen layout fix (#3307)
+- Fixed: left slider was affecting the value of the right slider on X9E (#2639)
+- USB Joystick now supports 24 buttons (CH9-32) (#3268)
+- Main view adjustments for 3-char switch names (#3278)
+
+
+[ARM (Taranis, Sky9x, 9XR-PRO, AR9X)]
+
+- Channel jitter reduced (#3233)
+- Fixed: EDGE Logical switch internal state was being reset by the AND switch, that affected its function (it looked like AND was applied before the EDGE processing, not after like it is done for other logical switch types) (#2939)
+
+
+[Lua]
+
+- Some Lua fields were not available to scripts (#3223)
+- Fixed: only first 32 input lines (out of 64) were accessible in Lua (#3285)
+- playDuration() second parameter is now really optional (#3329)
+- Fixed Lua io.open() problem for non-existing files (#3342)
+
+
+[Mega2560]
+
+- Fixed: First PPM pulse in the frame was longer (#2981)
+
+
+[All]
+
+- Various texts and translations corrections (se, it, pl, de)
+- Text to speech fixes (hu, sp)
+- Various small bug-fixes
+- PowerBox telemetry sensor names changed
+- Removed a few legacy timer limitations, fix non-working limit (#3301)
+- Removed the "RF signal low" alert before "Telemetry lost" when powering off the receiver (#2616)
+
+
+
+Version 2.1.7 / 2016-01-04
+
+Notice: Lua model wizard was fixed (#3061)
+and needs to be installed on the radio SD card. Download from http://lua-21.open-tx.org/wizard.zip
+
+[Taranis]
+
+- Added Crossfire (inverted serial) protocol on S.PORT pin in the module bay (#2894)
+- Added telemetry unit conversions from km/h (#3059)
+- LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant, enabled range check in EU mode
+- Added support for language-specific chars in model notes
+
+
+[Lua]
+
+- Enhanced luaGetVersion(): return the radio type (#2947), returns version as numbers (#3095)
+- Allow usage of PLUS, MINUS, MENU and ENT(short) and EXIT(short) keys in telemetry scripts (#2469)
+- Lua string library added (#3095)
+- Fixed: Close any Lua open files when radio powers off (#3062)
+- getValue() now also returns pilot position (#2921)
+- Added additional Taranis X9E fields
+- Lua getFlightMode() function added (#3127, #2921)
+- Fixed: Inputs were not exported as Lua fields
+- Fixed: some wizard lines were not visible anymore (#3061)
+- Lua PREC1 and PREC2 formatting parameters now functioning same as in 2.0 (#3150)
+
+
+[Sky9x / 9XR-PRO / AR9X]
+
+- Added support for FrSky D with inverted signal for 9XR pro (#3139)
+
+
+[ARM]
+
+- Fixed: Wrong telemetry unit and precision was used for V2 in logical switches (Taranis not affected) (#3071)
+- Received value unit for Air speed sensor set to knots (all FrSky sensors send speed in knots) (#3043)
+- Added support for FrSky Powerbox sensor (#2970)
+- Fixed Special Function - Adjust GVAR: increment/decrement could cause GVAR value to overflow the allowed range (±1024) (#2917)
+- Bad Value for GVAR When Adjusting GVx to Another GVx in Special Functions (#3103)
+
+
+[All]
+
+- Various texts and translations corrections
+- Various small bug-fixes
+
+
+
Version 2.1.6 / 2015-11-11
[Taranis]