diff --git a/Makefile b/Makefile
index da6efe958..b66a07f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -269,6 +269,13 @@ ifeq ($(TARGET),freebsd)
   USE_TPROXY     = implicit
   USE_LIBCRYPT   = implicit
 else
+ifeq ($(TARGET),osx)
+  # This is for Mac OS/X
+  USE_POLL       = implicit
+  USE_KQUEUE     = implicit
+  USE_TPROXY     = implicit
+  USE_LIBCRYPT   = implicit
+else
 ifeq ($(TARGET),openbsd)
   # This is for OpenBSD >= 3.0
   USE_POLL       = implicit
@@ -291,6 +298,7 @@ ifeq ($(TARGET),cygwin)
 endif # cygwin
 endif # aix52
 endif # openbsd
+endif # osx
 endif # freebsd
 endif # solaris
 endif # linux2628
diff --git a/README b/README
index 0da372018..01cb99ded 100644
--- a/README
+++ b/README
@@ -28,6 +28,7 @@ and assign it to the TARGET variable :
   - linux2628   for Linux 2.6.28 and above (enables splice and tproxy)
   - solaris     for Solaris 8 or 10 (others untested)
   - freebsd     for FreeBSD 5 to 8.0 (others untested)
+  - osx         for Mac OS/X
   - openbsd     for OpenBSD 3.1 to 5.2 (others untested)
   - aix52       for AIX 5.2
   - cygwin      for Cygwin