diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1685f4722..5665f393d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,7 +14,7 @@ We recommend trying the following commands before sending a pull request to ensu
 
 - `cargo fmt --all` Ensures all code is correctly formatted.
 - Run `cargo test` in the crates that you are modifying.
-- Run `cargo build --all` (nightly) or `cargo build --all --exclude wasmer-singlepass-backend`
+- Run `cargo build --all`.
 
 A comprehensive CI test suite will be run by a Wasmer team member after the PR has been created.
 
@@ -25,9 +25,3 @@ A comprehensive CI test suite will be run by a Wasmer team member after the PR h
 `Didn't find usable system-wide LLVM`
 
 Building Wasmer with the LLVM backend requires LLVM to be installed
-
-#### Singlepass Nightly Only
-
-`error[E0554]: #![feature] may not be used on the stable release channel`
-
-Building Wasmer with the singlepass backend requires the nightly version of Rust
diff --git a/Makefile b/Makefile
index 5c1753918..b5d2d9a85 100644
--- a/Makefile
+++ b/Makefile
@@ -13,18 +13,13 @@ compilers :=
 # Singlepass is enabled
 RUST_VERSION := $(shell rustc -V)
 
-ifneq (, $(findstring nightly,$(RUST_VERSION)))
-	# Singlepass doesn't work yet on Windows
-	ifneq ($(OS), Windows_NT)
-		compilers += singlepass
-	endif
-endif
-
 ifeq ($(ARCH), x86_64)
 	# In X64, Cranelift is enabled
 	compilers += cranelift
 	# LLVM could be enabled if not in Windows
 	ifneq ($(OS), Windows_NT)
+		# Singlepass doesn't work yet on Windows
+		compilers += singlepass
 		# Autodetect LLVM from llvm-config
 		ifneq (, $(shell which llvm-config))
 			LLVM_VERSION := $(shell llvm-config --version)
diff --git a/lib/compiler-singlepass/README.md b/lib/compiler-singlepass/README.md
index f582fd1ea..730e73955 100644
--- a/lib/compiler-singlepass/README.md
+++ b/lib/compiler-singlepass/README.md
@@ -32,8 +32,3 @@ orders of magnitude faster than `wasmer-compiler-cranelift` and
 The fact that singlepass is not prone to JIT bombs and offers a very
 predictable compilation speed makes it ideal for **blockchains** and other
 systems where fast and consistent compilation times are very critical.
-
-## Requirements
-
-At the moment, this crate depends on Rust nightly to be compiled, as it uses
-`dynasm-rs` which can only be compiled in Nightly.