diff --git a/Misc/NEWS b/Misc/NEWS
index 38c70836da9..b91bd74ed38 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -134,6 +134,9 @@ Library
   This is a behavior change, so email's minor version number is now bumped, to
   version 4.0.2, for the 2.7 release.
 
+- Issue #8235: _socket: Add the constant ``SO_SETFIB``.  SO_SETFIB is
+  a socket option available on FreeBSD 7.1 and newer.
+
 Extension Modules
 -----------------
 
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index d44a691cf1a..901cb7d916d 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4779,6 +4779,9 @@ init_socket(void)
 #ifdef	SO_TYPE
 	PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
 #endif
+#ifdef SO_SETFIB
+    PyModule_AddIntConstant(m, "SO_SETFIB", SO_SETFIB);
+#endif
 
 	/* Maximum number of connections for "listen" */
 #ifdef	SOMAXCONN