diff --git a/Lib/posixfile.py b/Lib/posixfile.py
index 2fa600fdf33..ff2910779bc 100644
--- a/Lib/posixfile.py
+++ b/Lib/posixfile.py
@@ -181,7 +181,7 @@ class _posixfile_:
         if sys.platform in ('netbsd1',
                             'openbsd2',
                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                            'freebsd6', 'freebsd7',
+                            'freebsd6', 'freebsd7', 'freebsd8',
                             'bsdos2', 'bsdos3', 'bsdos4'):
             flock = struct.pack('lxxxxlxxxxlhh', \
                   l_start, l_len, os.getpid(), l_type, l_whence)
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 7db63cb60a2..0fa4c61b4c8 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1104,6 +1104,7 @@ _expectations = {
 _expectations['freebsd5'] = _expectations['freebsd4']
 _expectations['freebsd6'] = _expectations['freebsd4']
 _expectations['freebsd7'] = _expectations['freebsd4']
+_expectations['freebsd8'] = _expectations['freebsd4']
 
 class _ExpectedSkips:
     def __init__(self):
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 2d800b2a5c9..0a6ab08e0db 100755
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -23,7 +23,7 @@ if sys.platform.startswith('atheos'):
 if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
                     'Darwin1.2', 'darwin',
                     'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
-                    'freebsd6', 'freebsd7',
+                    'freebsd6', 'freebsd7', 'freebsd8',
                     'bsdos2', 'bsdos3', 'bsdos4',
                     'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
     if struct.calcsize('l') == 8:
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 8dddf5e5b65..3e2d04c6824 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -330,7 +330,7 @@ class GeneralModuleTests(unittest.TestCase):
         # I've ordered this by protocols that have both a tcp and udp
         # protocol, at least for modern Linuxes.
         if sys.platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                            'freebsd7', 'darwin'):
+                            'freebsd7', 'freebsd8', 'darwin'):
             # avoid the 'echo' service on this platform, as there is an
             # assumption breaking non-standard port/protocol entry
             services = ('daytime', 'qotd', 'domain')
diff --git a/setup.py b/setup.py
index 0424c0d2427..7f252ef410d 100644
--- a/setup.py
+++ b/setup.py
@@ -1159,7 +1159,7 @@ class PyBuildExt(build_ext):
             missing.append('linuxaudiodev')
 
         if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
-                        'freebsd7'):
+                        'freebsd7', 'freebsd8'):
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
         else:
             missing.append('ossaudiodev')