diff --git a/phpBB/config/crypto.yml b/phpBB/config/crypto.yml
new file mode 100644
index 0000000000..03a7cdce2e
--- /dev/null
+++ b/phpBB/config/crypto.yml
@@ -0,0 +1,35 @@
+services:
+    crypto.driver.bcrypt:
+        class: phpbb_crypto_driver_bcrypt
+        arguments:
+            - @config
+        tags:
+            - { name: crypto.driver }
+
+    crypto.driver.bcrypt_2y:
+        class: phpbb_crypto_driver_bcrypt_2y
+        arguments:
+            - @config
+        tags:
+            - { name: crypto.driver }
+
+    crypto.driver.salted_md5:
+        class: phpbb_crypto_driver_salted_md5
+        arguments:
+            - @config
+        tags:
+            - { name: crypto.driver }
+
+    crypto.driver.phpass:
+        class: phpbb_crypto_driver_phpass
+        arguments:
+            - @config
+        tags:
+            - { name: crypto.driver }
+
+    crypto.driver_collection:
+        class: phpbb_di_service_collection
+        arguments:
+            - @service_container
+        tags:
+            - { name: service_collection, tag: crypto.driver }
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 32dd2759b3..e7c3232fa7 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -6,6 +6,7 @@ imports:
     - { resource: avatars.yml }
     - { resource: feed.yml }
     - { resource: auth_providers.yml }
+    - { resource: crypto.yml }
 
 services:
     acl.permissions: