diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 08461658d..255e7be8e 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -37933,7 +37933,11 @@ SLPS-01504:
 SLES-01156:
   name: "Diablo (Europe) (En,Fr,De,Sv)"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+    - DisableCDROMSpeedupOnMDEC # Fixes opening credits.
   metadata:
     publisher: "Electronic Arts / Blizzard Entertaiment"
     developer: "Climax Group"
@@ -37954,7 +37958,11 @@ SLES-01156:
 SLPS-01416:
   name: "Diablo (Japan)"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+    - DisableCDROMSpeedupOnMDEC # Fixes opening credits.
   metadata:
     publisher: "Electronic Arts / Blizzard Entertaiment"
     developer: "Climax Group"
@@ -37975,7 +37983,11 @@ SLUS-00619:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+    - DisableCDROMSpeedupOnMDEC # Fixes opening credits.
   metadata:
     publisher: "Electronic Arts / Blizzard Entertaiment"
     developer: "Climax Group"
@@ -37996,7 +38008,11 @@ SLUS-00619:
 SLPS-91177:
   name: "Diablo [Playstation the Best]"
   controllers:
+    - AnalogController
     - DigitalController
+  traits:
+    - DisableAutoAnalogMode # Analog sticks do nothing.
+    - DisableCDROMSpeedupOnMDEC # Fixes opening credits.
   metadata:
     publisher: "Electronic Arts / Blizzard Entertaiment"
     developer: "Climax Group"