diff --git a/doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml
index 34c78748d..c052bb0b6 100644
--- a/doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml
+++ b/doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml
@@ -2,12 +2,11 @@ doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
 
-        # IMPORTANT: You MUST configure your db driver and server version,
+        # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
-        #driver: 'mysql'
         #server_version: '5.7'
 
-        # Only needed for MySQL (ignored otherwise)
+        # only needed for MySQL
         charset: utf8mb4
         default_table_options:
             collate: utf8mb4_unicode_ci
diff --git a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
index 81636ee1f..444931883 100644
--- a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
+++ b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
@@ -2,12 +2,11 @@ doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
 
-        # IMPORTANT: You MUST configure your db driver and server version,
+        # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
-        #driver: 'mysql'
         #server_version: '5.7'
 
-        # Only needed for MySQL (ignored otherwise)
+        # only needed for MySQL
         charset: utf8mb4
         default_table_options:
             collate: utf8mb4_unicode_ci
diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.6/manifest.json
index 3866a04a8..c5e7da027 100644
--- a/doctrine/doctrine-bundle/1.6/manifest.json
+++ b/doctrine/doctrine-bundle/1.6/manifest.json
@@ -9,8 +9,8 @@
     "env": {
         "#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url",
         "#2": "For an SQLite database, use: \"sqlite:///%kernel.project_dir%/var/data.db\"",
-        "#3": "For a PostgreSQL database, use: \"postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=UTF-8\"",
-        "#4": "IMPORTANT: You MUST configure your db driver and server version, either here or in config/packages/doctrine.yaml",
+        "#3": "For a PostgreSQL database, use: \"postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8\"",
+        "#4": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
         "DATABASE_URL": "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
     }
 }
diff --git a/doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml
new file mode 100644
index 000000000..5e80e77b1
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml
@@ -0,0 +1,18 @@
+doctrine:
+    dbal:
+        url: '%env(resolve:DATABASE_URL)%'
+
+        # IMPORTANT: You MUST configure your server version,
+        # either here or in the DATABASE_URL env var (see .env file)
+        #server_version: '5.7'
+    orm:
+        auto_generate_proxy_classes: true
+        naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+        auto_mapping: true
+        mappings:
+            App:
+                is_bundle: false
+                type: annotation
+                dir: '%kernel.project_dir%/src/Entity'
+                prefix: 'App\Entity'
+                alias: App
diff --git a/doctrine/doctrine-bundle/2.0/config/packages/prod/doctrine.yaml b/doctrine/doctrine-bundle/2.0/config/packages/prod/doctrine.yaml
new file mode 120000
index 000000000..2e0bc3c35
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.0/config/packages/prod/doctrine.yaml
@@ -0,0 +1 @@
+../../../../1.12/config/packages/prod/doctrine.yaml
\ No newline at end of file
diff --git a/doctrine/doctrine-bundle/2.0/manifest.json b/doctrine/doctrine-bundle/2.0/manifest.json
new file mode 120000
index 000000000..f2934780c
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.0/manifest.json
@@ -0,0 +1 @@
+../1.6/manifest.json
\ No newline at end of file
diff --git a/doctrine/doctrine-bundle/2.0/post-install.txt b/doctrine/doctrine-bundle/2.0/post-install.txt
new file mode 120000
index 000000000..4f3bb5c7d
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.0/post-install.txt
@@ -0,0 +1 @@
+../1.6/post-install.txt
\ No newline at end of file
diff --git a/doctrine/doctrine-bundle/2.0/src b/doctrine/doctrine-bundle/2.0/src
new file mode 120000
index 000000000..d78be8c53
--- /dev/null
+++ b/doctrine/doctrine-bundle/2.0/src
@@ -0,0 +1 @@
+../1.6/src
\ No newline at end of file