diff --git a/CHANGELOG b/CHANGELOG
index 728322820..0569c19bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 Change Log for Releases
 =======================
 
+## 21.04
+  * Rename project from srsLTE to srsRAN
+  * Add initial 5G NSA support to srsUE (including x86-optimized FEC and PHY layer)
+  * Add PDCP discard support
+  * Add UL power control, measurement gaps and a new proportional fair scheduler to srsENB
+  * Extend GTP-U tunneling to support tunnel forwarding over S1
+  * Optimize many data structures, remove dynamic memory allocations in data plane
+  * Improved S1AP error handling and enhanced event reporting
+  * Update ASN.1 packing/unpacking, RRC to Rel 15.11, S1AP to Rel 16.1
+  * Update PCAP writer to use UDP framing
+  * Other bug-fixes and improved stability and performance in all parts
+
 ## 20.10.1
   * Fix bug in srsENB that effectively disabled UL HARQ
 
diff --git a/README.md b/README.md
index da526758c..381166fc5 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ srsRAN is a 4G/5G software radio suite developed by SRS (www.softwareradiosystem
 See the srsRAN project pages (www.srsran.com) for documentation, guides and project news.
 
 It includes:
-  * srsUE - a complete SDR LTE UE application featuring all layers from PHY to IP
+  * srsUE - a complete SDR 4G/5G UE application featuring all layers from PHY to IP
   * srsENB - a complete SDR LTE eNodeB application 
   * srsEPC - a light-weight LTE core network implementation with MME, HSS and S/P-GW
   * a highly modular set of common libraries for PHY, MAC, RLC, PDCP, RRC, NAS, S1AP and GW layers. 
@@ -58,7 +58,8 @@ srsENB Features
 ---------------
 
  * FDD configuration
- * Round Robin MAC scheduler with FAPI-like C++ API
+ * IntraENB- and InterENB (S1) mobility support
+ * Proportional-fair and Round Robin MAC scheduler with FAPI-like C++ API
  * SR support
  * Periodic and Aperiodic CQI feedback support
  * Standard S1AP and GTP-U interfaces to the Core Network
diff --git a/cmake/modules/SRSRANVersion.cmake b/cmake/modules/SRSRANVersion.cmake
index 7843a6dfb..51559a0af 100644
--- a/cmake/modules/SRSRANVersion.cmake
+++ b/cmake/modules/SRSRANVersion.cmake
@@ -6,8 +6,8 @@
 # the distribution.
 #
 
-SET(SRSRAN_VERSION_MAJOR 20)
-SET(SRSRAN_VERSION_MINOR 10)
-SET(SRSRAN_VERSION_PATCH 1)
+SET(SRSRAN_VERSION_MAJOR 21)
+SET(SRSRAN_VERSION_MINOR 04)
+SET(SRSRAN_VERSION_PATCH 0)
 SET(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")
 SET(SRSRAN_SOVERSION 0)