diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 1be8c7ad264..3c94501b1a5 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -417,11 +417,12 @@ rec {
       # Cortex-A15: -mfpu=neon-vfpv4
 
       # More about FPU:
-       #https://wiki.debian.org/ArmHardFloatPort/VfpComparison
+      # https://wiki.debian.org/ArmHardFloatPort/VfpComparison
 
-      # We try to be compatible with beaglebone by now
+      # vfpv3-d16 is what Debian uses and seems to be the best compromise: NEON is not supported in e.g. Scaleway or Tegra 2,
+      # and the above page suggests NEON is only an improvement with hand-written assembly.
       arch = "armv7-a";
-      fpu = "neon";
+      fpu = "vfpv3-d16";
       float = "hard";
 
       # For Raspberry Pi the 2 the best would be: