diff --git a/debian/changelog b/debian/changelog
index edd3b9811..c14feb2c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1017,6 +1017,11 @@ linux (4.19.131-1) UNRELEASED; urgency=medium
     redundant with "sched/core: Fix illegal RCU from offline CPUs"
   * Bump ABI to 10
 
+  [ YunQiang Su ]
+  * [mips*]: Do not enable MIPS_O32_FP64_SUPPORT, since golang hasn't been
+    migrated to FPXX yet and this breaks the golang packages on Octeon
+    hardware. In turns this disables MSA on 32-bit kernels.
+
  -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 13 May 2020 17:44:43 +0200
 
 linux (4.19.118-2+deb10u1) buster-security; urgency=high
diff --git a/debian/config/kernelarch-mips/config b/debian/config/kernelarch-mips/config
index 683a871b7..63720baaa 100644
--- a/debian/config/kernelarch-mips/config
+++ b/debian/config/kernelarch-mips/config
@@ -9,7 +9,6 @@ CONFIG_KEXEC=y
 CONFIG_SECCOMP=y
 CONFIG_PCI=y
 # CONFIG_RAPIDIO is not set
-CONFIG_MIPS_O32_FP64_SUPPORT=y
 #. Ignored in 32-bit configurations
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y