diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76c5f1aa..78f51bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,23 @@
 # Changelog
 
-## [Unreleased]
+## [v2.2.1]
+
+**April 10, 2018**
 
 Bug fixes:
 
  - Don't assign option and argument options if no value was provided, preserving the default CLR value unless there is user-input.
  - Fix ShowHint() to use ShortName or SymbolName if OptionHelp.LongName is not set
  - Fix [#85](https://github.com/natemcmaster/CommandLineUtils/issues/85) - lower priority of resolving AdditionalServices after most built-in services
+ - Fix [#79](https://github.com/natemcmaster/CommandLineUtils/issues/79) - OnValidate callbacks invoked before property valueswere assigned
 
 Minor improvements:
 
- - Improve help text generation. Align columns, show top-level command description, and add `protected virtual` API to `DefaultHelpTextGenerator`
-   to make it easier to customize help text 
+ - Improve help text generation. Align columns, show top-level command description, and add `protected virtual` API to `DefaultHelpTextGenerator` to make it easier to customize help text
 
 ## [v2.2.0]
 
-**March 30,2018**
+**March 30, 2018**
 
  - Added support for command validators using `CommandLineApplication.Validators` and added a new OnValidate convention
  - Fix minor bug in ArgumentEscaper where some strings were not properly escaped
@@ -139,7 +141,8 @@ Other:
 [@rmcc13]: https://github.com/rmcc13
 [@sebastienros]: https://github.com/sebastienros
 
-[Unreleased]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.1...HEAD
+[v2.2.1]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.0...v2.2.1
 [v2.2.0]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.0-rc...v2.2.0
 [v2.2.0-rc]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.0-beta...v2.2.0-rc
 [v2.2.0-beta]: https://github.com/natemcmaster/CommandLineUtils/compare/v2.2.0-alpha...v2.2.0-beta
diff --git a/README.md b/README.md
index 1425339c..1e3e5607 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ $ dotnet add package McMaster.Extensions.CommandLineUtils
 ```
 ```xml
 <ItemGroup>
-  <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
+  <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.1" />
 </ItemGroup>
 ```
 
diff --git a/docfx_project/docs/concepts/samples/dependency-injection/custom/CustomServices.csproj b/docfx_project/docs/concepts/samples/dependency-injection/custom/CustomServices.csproj
index 63fab5d5..f0369de0 100644
--- a/docfx_project/docs/concepts/samples/dependency-injection/custom/CustomServices.csproj
+++ b/docfx_project/docs/concepts/samples/dependency-injection/custom/CustomServices.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
   </ItemGroup>
 
diff --git a/docfx_project/docs/concepts/samples/dependency-injection/standard/StandardServices.csproj b/docfx_project/docs/concepts/samples/dependency-injection/standard/StandardServices.csproj
index ec07328f..f6d7094f 100644
--- a/docfx_project/docs/concepts/samples/dependency-injection/standard/StandardServices.csproj
+++ b/docfx_project/docs/concepts/samples/dependency-injection/standard/StandardServices.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/docfx_project/docs/intro.md b/docfx_project/docs/intro.md
index 3326fca6..f96db09a 100644
--- a/docfx_project/docs/intro.md
+++ b/docfx_project/docs/intro.md
@@ -22,7 +22,7 @@
 
     ```xml
     <ItemGroup>
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.1" />
     </ItemGroup>
     ```
 
@@ -85,4 +85,4 @@ public class Program
 
 ## More information
 
-For more information, you can refer to the sample applications.
\ No newline at end of file
+For more information, you can refer to the sample applications.
diff --git a/docfx_project/index.md b/docfx_project/index.md
index ce1b249e..edf68bc8 100644
--- a/docfx_project/index.md
+++ b/docfx_project/index.md
@@ -22,7 +22,7 @@ $ dotnet add package McMaster.Extensions.CommandLineUtils
 ```
 ```xml
 <ItemGroup>
-  <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.0" />
+  <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.1" />
 </ItemGroup>
 ```
 
diff --git a/releasenotes.props b/releasenotes.props
index b4601963..4e09f581 100644
--- a/releasenotes.props
+++ b/releasenotes.props
@@ -2,44 +2,16 @@
   <PropertyGroup>
     <PackageReleaseNotes>
 <![CDATA[
-New features:
-  - Added more validation attributes.
-     - Add the `[FileExists]` attribute
-     - Add the `[FileOrDirectoryExists]` attribute
-     - Add the `[DirectoryExists]` attribute
-     - Add the `[LegalFilePath]` attribute
-     - Add the `[AllowedValues]` attribute
-  - Added a new, fluent API for validation.
-     - Added `Option().Accepts()` and `Argument().Accepts()`
-     - Add `.ExistingFile()`
-     - Add `.ExistingFileOrDirectory()`
-     - Add `.ExistingDirectory()`
-     - Add `.EmailAddress()`
-     - Add `.LegalFilePath()`
-     - Add `.MinLength(length)`
-     - Add `.MaxLength(length)`
-     - Add `.RegularExpression(pattern)`
-     - Add `.Values(string[] allowedValues)`
-     - Add `.Range(min, max)`
-  - Add `CommandOptionType.SingleOrNoValue`.
-    - Options of this type can be a switch, or have a value but only in the form `--param:value` or `--param=value`.
-    - Support mapping `ValueTuple<bool,T>` to `CommandOptionType.SingleOrNoValue`
-  - Generic commands, options, and arguments
-    - Added `CommandLineApplication<TModel>`. This allows associating an application with a specific .NET type
-    - Add support for `Option<T>` and `Argument<T>`
-  - Convention API
-     - Adds support for writing your own conventions to convert command line arguments into a .NET type
-     - Add API to use a dozen of built-in conventions
+Bug fixes:
 
-Other enhancements:
-  - Support parsing enums
-  - @rmcc13 - `HelpOption` can be set to be inherited by all subcommands
-  - @atruskie - Support for parsing double and floats
-  - @sebastienros - Support for case-insensitive options
-  - @atruskie: Add support for user-defined value parsers using `IValueParser` and `CommandLineApplication.ValueParsers`.
-  - Add support for constructor injection and dependency injection by providing a custom service provider
-  - Parse these values to boolean: T, t, F, f, 0, 1
-  - Add `VersionOptionFromMember` to use a property or method as the source of version information
+- Don't assign option and argument options if no value was provided, preserving the default CLR value unless there is user-input.
+- Fix ShowHint() to use ShortName or SymbolName if OptionHelp.LongName is not set
+- Fix #85 - lower priority of resolving AdditionalServices after most built-in services
+- Fix #79 - OnValidate callbacks invoked before property valueswere assigned
+
+Minor improvements:
+
+- Improve help text generation. Align columns, show top-level command description, and add `protected virtual` API to `DefaultHelpTextGenerator` to make it easier to customize help text
 
 See more details here: https://github.com/natemcmaster/CommandLineUtils/blob/master/CHANGELOG.md#v$(VersionPrefix.Replace('.',''))
 ]]>
diff --git a/version.props b/version.props
index 9aa318b5..9eab8bb4 100644
--- a/version.props
+++ b/version.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <VersionPrefix>2.2.1</VersionPrefix>
-    <VersionSuffix>alpha</VersionSuffix>
+    <VersionSuffix>rtm</VersionSuffix>
     <PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
     <PackageVersion Condition="'$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' == 'rtm'">$(VersionPrefix)</PackageVersion>