diff --git a/Cargo.lock b/Cargo.lock
index b1f5994..4a922d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -82,12 +82,14 @@ dependencies = [
 
 [[package]]
 name = "bcder"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.3.2"
+source = "git+https://github.com/NLnetLabs/bcder.git#181ac4ef13e03081459c2f2b433753cd249769a5"
 dependencies = [
  "backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unwrap 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -884,7 +886,7 @@ dependencies = [
 
 [[package]]
 name = "routinator"
-version = "0.5.0"
+version = "0.5.1"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -902,7 +904,7 @@ dependencies = [
  "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "log-reroute 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rpki 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rpki 0.5.1 (git+https://github.com/NLnetLabs/rpki-rs.git)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syslog 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -914,11 +916,11 @@ dependencies = [
 
 [[package]]
 name = "rpki"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.5.1"
+source = "git+https://github.com/NLnetLabs/rpki-rs.git#093c84e1e9eece95c247990ba44dd5d2f27b3ce2"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "bcder 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bcder 0.3.2 (git+https://github.com/NLnetLabs/bcder.git)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1388,7 +1390,7 @@ dependencies = [
 "checksum backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "88fb679bc9af8fa639198790a77f52d345fe13656c08b43afa9424c206b731c6"
 "checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b"
 "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum bcder 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcbd957f2a5ae637507ec3a4a106df463075b790992c4fadcd176c056db7b495"
+"checksum bcder 0.3.2 (git+https://github.com/NLnetLabs/bcder.git)" = "<none>"
 "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum boxfnonce 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5988cb1d626264ac94100be357308f29ff7cbdd3b36bda27f450a4ee3f713426"
@@ -1478,7 +1480,7 @@ dependencies = [
 "checksum regex-syntax 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9b01330cce219c1c6b2e209e5ed64ccd587ae5c67bed91c0b49eecf02ae40e21"
 "checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e"
 "checksum ring 0.14.6 (registry+https://github.com/rust-lang/crates.io-index)" = "426bc186e3e95cac1e4a4be125a4aca7e84c2d616ffc02244eef36e2a60a093c"
-"checksum rpki 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7e509d747aa8b6a4bb4cb302c8f33757e2e088a634bf48ef34b1d582207643e4"
+"checksum rpki 0.5.1 (git+https://github.com/NLnetLabs/rpki-rs.git)" = "<none>"
 "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
diff --git a/Cargo.toml b/Cargo.toml
index 6efde59..2a02bf4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "routinator"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2018"
 authors = ["The NLnet Labs RPKI Team <rpki@nlnetlabs.nl>"]
 description = "An RPKI relying party software."
@@ -26,7 +26,7 @@ listenfd	= "^0.3.3"
 log             = "^0.4"
 log-reroute	= "^0.1.2"
 num_cpus        = "^1.0"
-rpki            = "^0.5.0"
+rpki            = "^0.5.1"
 slab            = "^0.4"
 tempfile        = "^3.0"
 tokio           = "^0.1"
@@ -77,3 +77,7 @@ assets = [
     ["etc/routinator.conf.system-service", "etc/routinator/routinator.conf", "644"]
 ]
 
+[patch.crates-io]
+bcder = { git="https://github.com/NLnetLabs/bcder.git" }
+rpki = { git="https://github.com/NLnetLabs/rpki-rs.git" }
+
diff --git a/Changelog.md b/Changelog.md
index b355f05..e584e3c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## Unreleased future version
+
+Breaking Changes
+
+News
+
+Bug Fixes
+
+
 ## 0.5.0 ‘Why Not Try a Holiday in Sweden This Year?’
 
 Breaking Changes