diff --git a/History.md b/History.md
index 98e3d2b5..53355760 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,21 @@
+## 1.2.3
+
+- Corrects Rack 2.x compatibility when used with modern Rails, and requires Rack 2.x going forward
+- update (bundled) rack to 2.2.10
+- forward ports all 1.1.x fixes to the 1.2.x stream which were omitted in 1.2.2 release (#262)
+- fixes regression NoMethodError undefined method get_header (#259)
+- correct use of session store with Rails 7.0+ (#244)
+- reinstate automated tests for Rails 5.0 - 7.2 (#271)
+
+## 1.2.2
+
+First release of the 1.2.x branch.
+- Requires Java 8 or later
+- Requires Java Servlet API 3.0 or later
+- Improved logger implementation
+- Fixes broken multipart data (#247)
+- update (bundled) rack to 2.2.9
+
 ## 1.1.22
 
 - compile using Java 6 source compat
@@ -216,7 +234,6 @@ Changes from 1.1.15 apply since the previous release got yanked due a regression
 - jruby runtime pooling for plain Rack applications (not just Rails)
 
 ## 1.1.7 (21/06/12)
->>>>>>> 1.1-stable:History.md
 
 - support for delegating logs to java.util.logging (jruby.rack.logging: JUL)
 - extend RackLogger with levels for better logging with underlying log impl
diff --git a/README.md b/README.md
index 654fb220..588ba76b 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
 
 For more information on Rack, visit http://rack.github.io/.
 
-**This README (master) targets JRuby-Rack 1.2 (unreleased) please use the
+**This README (master) targets JRuby-Rack 1.2. Please use the
 [1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branch for
 current stable 1.1.x releases.**
 
@@ -15,11 +15,14 @@ current stable 1.1.x releases.**
 
 ## Compatibility
 
-JRuby-Rack 1.1.x aims to be compatible with JRuby >= 1.6.4 (we recommend 1.7.x),
-Generally, any container that supports Java Servlet >= 2.5 (JEE 5) is supported.
+JRuby-Rack 1.2.x
+- aims to be compatible with JRuby >= 9.3 and its supported JDK versions
+- supports any container compatible with Java Servlet 3.0 API
+
+JRuby-Rack 1.1.x
+- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4.x)
+- supports any container compatible with Java Servlet 2.5 API (JEE 5)
 
-JRuby-Rack 1.2.x is expected to officially support JRuby >= 1.7.10 and will be
-compiled against the Java Servlet 3.0 API.
 
 ## Getting Started
 
@@ -277,7 +280,7 @@ provided *config.ru* the bundled (latest) version of Rack will get loaded.
 Use **rack.version** to specify the Rack gem version to be loaded before rackup :
 
     # encoding: UTF-8
-    # rack.version: ~>1.3.6 (before code is loaded gem '~>1.3.6' will be called)
+    # rack.version: ~>2.2.10 (before code is loaded gem '~>2.2.10' will be called)
 
 Or the equivalent of doing `bundle exec rackup ...` if you're using Bundler :