diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index b07e1ede9..1a79d15bf 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -5,7 +5,7 @@
 bl_info = {
     "name": "FBX format",
     "author": "Campbell Barton, Bastien Montagne, Jens Restemeier, @Mysteryem",
-    "version": (5, 11, 6),
+    "version": (5, 11, 7),
     "blender": (4, 1, 0),
     "location": "File > Import-Export",
     "description": "FBX IO meshes, UVs, vertex colors, materials, textures, cameras, lamps and actions",
diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py
index 234de2b59..148d45f76 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -1162,11 +1162,13 @@ def fbx_data_mesh_elements(root, me_obj, scene_data, done_meshes):
                 # All faces are smooth shaded, so we can get normals from the vertices.
                 normal_source = me.vertex_normals
                 normal_mapping = b"ByVertice"
-            case 'FACE':
-                # Either all faces or all edges are sharp, so we can get normals from the faces.
-                normal_source = me.polygon_normals
-                normal_mapping = b"ByPolygon"
-            case 'CORNER':
+            # External software support for b"ByPolygon" normals does not seem to be as widely available as the other
+            # mappings. See blender/blender#117470.
+            # case 'FACE':
+            #     # Either all faces or all edges are sharp, so we can get normals from the faces.
+            #     normal_source = me.polygon_normals
+            #     normal_mapping = b"ByPolygon"
+            case 'CORNER' | 'FACE':
                 # We have a mix of sharp/smooth edges/faces or custom split normals, so need to get normals from
                 # corners.
                 normal_source = me.corner_normals