diff --git a/Cargo.toml b/Cargo.toml
index ef6323620..8e37e0aaa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,6 +57,7 @@ path = "examples/repl/main.rs"
 
 
 [features]
-default = ["nightly"]
+default = ["nightly", "ringbuf"]
 vendored = ["native-tls/vendored", "reqwest/default-tls-vendored"]
 nightly = ["pgp/nightly"]
+ringbuf = ["pgp/ringbuf"]
diff --git a/README.md b/README.md
index db684fe51..892fdf2bb 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,12 @@ $ cargo test --all
 $ cargo build -p deltachat_ffi --release
 ```
 
+## Features
+
+- `vendored`: When using Openssl for TLS, this bundles a vendored version.
+- `nightly`: Enable nightly only performance and security related features.
+- `ringbuf`: Enable the use of [`slice_deque`](https://github.com/gnzlbg/slice_deque) in pgp.
+
 [circle-shield]: https://img.shields.io/circleci/project/github/deltachat/deltachat-core-rust/master.svg?style=flat-square
 [circle]: https://circleci.com/gh/deltachat/deltachat-core-rust/
 [appveyor-shield]: https://ci.appveyor.com/api/projects/status/lqpegel3ld4ipxj8/branch/master?style=flat-square
diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml
index 5df91a47b..7d619481e 100644
--- a/deltachat-ffi/Cargo.toml
+++ b/deltachat-ffi/Cargo.toml
@@ -20,4 +20,7 @@ libc = "0.2"
 human-panic = "1.0.1"
 
 [features]
-default = ["deltachat/vendored"]
+default = ["vendored", "nightly", "ringbuf"]
+vendored = ["deltachat/vendored"]
+nightly = ["deltachat/nightly"]
+ringbuf = ["deltachat/ringbuf"]