diff --git a/debian/changelog b/debian/changelog
index 4d2afee66..19d74159d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -102,6 +102,8 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
   * Bump ABI to 2
   * [x86] i2c: Change I2C to built-in and enable ACPI_I2C_OPREGION
     (Closes: #778896)
+  * usb-storage: Enable USB_UAS for the third time, hoping that it's finally
+    robust enough (Closes: #749014)
 
   [ Ian Campbell ]
   * [armhf+arm64] Enabled generic SYSCON regmap reset driver
diff --git a/debian/config/config b/debian/config/config
index 249e24085..de3d2cbd6 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4318,7 +4318,7 @@ CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
 CONFIG_USB_STORAGE_ENE_UB6250=m
-# CONFIG_USB_UAS is not set
+CONFIG_USB_UAS=m
 
 ##
 ## file: drivers/usb/usbip/Kconfig