diff --git a/Misc/NEWS b/Misc/NEWS
index 3efed784285..869fdf602fe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -848,6 +848,9 @@ Library
 
 - Issue #6247: The argparse module has been added to the standard library.
 
+- 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 e65303b2697..9dade1dacf5 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4551,6 +4551,9 @@ PyInit__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