diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9cf93e6bde..eec71ff9c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
           - x86_64-unknown-linux-gnu
         toolchain:
           - stable
-          - 1.36.0
+          - 1.38.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -88,7 +88,7 @@ jobs:
           override: true
 
       - name: Disable optimisation profiles
-        if: matrix.toolchain == '1.36.0'
+        if: matrix.toolchain == '1.38.0'
         run: sed -i '/^\[profile.*build-override]$/,/^$/{/^#/!{/^$/!d}}' Cargo.toml
 
       - name: cargo check
@@ -324,7 +324,7 @@ jobs:
           - x86_64-unknown-linux-gnu
         toolchain:
           - stable
-          - 1.36.0
+          - 1.38.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -367,7 +367,7 @@ jobs:
           override: true
 
       - name: Disable optimisation profiles
-        if: matrix.toolchain == '1.36.0'
+        if: matrix.toolchain == '1.38.0'
         run: sed -i '/^\[profile.*build-override]$/,/^$/{/^#/!{/^$/!d}}' Cargo.toml
 
       - name: cargo check
@@ -416,7 +416,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.36.0
+          toolchain: 1.38.0
           target: thumbv7m-none-eabi
           override: true
 
@@ -468,7 +468,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.36.0
+          toolchain: 1.38.0
           target: thumbv6m-none-eabi
           override: true
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d0ed005b..cc07454a42 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.5.8] - 2021-08-19
+
+- Feature flag was added to support `cortex-m v0.7.x`
+- MSRV raised to 1.38.
+
 ## [v0.5.7] - 2021-07-05
 
 - Backport: "you must enable the rt feature" compile time detection
diff --git a/README.md b/README.md
index 45bb9de840..2256091534 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Formerly known as Real-Time For the Masses.
 ![crates.io](https://img.shields.io/crates/v/cortex-m-rtic)
 ![docs.rs](https://docs.rs/cortex-m-rtic/badge.svg)
 ![book](https://img.shields.io/badge/web-rtic.rs-red.svg?style=flat&label=book&colorB=d33847)
-![rustc](https://img.shields.io/badge/rustc-1.36+-lightgray.svg)
+![rustc](https://img.shields.io/badge/rustc-1.38+-lightgray.svg)
 
 ## Features
 
@@ -46,7 +46,7 @@ Formerly known as Real-Time For the Masses.
 
 ## Requirements
 
-- Rust 1.36.0+
+- Rust 1.38.0+
 
 - Applications must be written using the 2018 edition.
 
diff --git a/ci/script.sh b/ci/script.sh
index 6c09909773..7748af8940 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -50,7 +50,7 @@ main() {
         fi
 
         if [ $TRAVIS_RUST_VERSION = nightly ]; then
-            # Tests where required MSRV > 1.36
+            # Tests where required MSRV > 1.38
             #local exs=(
             #)
             #for ex in ${exs[@]}; do
diff --git a/src/lib.rs b/src/lib.rs
index da9216d2fa..42735383f0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,7 +17,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.36 (2018 edition) and up. It *might*
+//! This crate is guaranteed to compile on stable Rust 1.38 (2018 edition) and up. It *might*
 //! compile on older versions but that may change in any new patch release.
 //!
 //! # Semantic Versioning