diff --git a/Makefile b/Makefile
index 95f4ef007f..3b6b4cb00a 100755
--- a/Makefile
+++ b/Makefile
@@ -244,7 +244,7 @@ LIBS+=-lresolv  #-lnjamd
 endif
 ifeq (${OSARCH},Darwin)
 LIBS+=-lresolv
-CFLAGS+=-D__OSX__
+CFLAGS+=-D__Darwin__
 endif
 ifeq (${OSARCH},FreeBSD)
 LIBS+=-lcrypto
diff --git a/config.c b/config.c
index b375669910..d8675e27cb 100755
--- a/config.c
+++ b/config.c
@@ -19,7 +19,7 @@
 #include <time.h>
 #define AST_INCLUDE_GLOB 1
 #ifdef AST_INCLUDE_GLOB
-#ifdef __OSX__
+#ifdef __Darwin__
 #define GLOB_ABORTED GLOB_ABEND
 #endif
 # include <glob.h>
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 323449da02..c5deb503c5 100755
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -38,7 +38,7 @@
 #include <sys/socket.h>
 #include <string.h>
 #include <errno.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__OSX__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__)
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #endif
@@ -46,7 +46,7 @@
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__OSX__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
 #include <net/if_dl.h>
 #include <ifaddrs.h>
 #endif