diff --git a/ChangeLog b/ChangeLog
index 9c3bd956ed4f95b9418c79b3c7830e249a783937..e99fc6572cb51290bd59bb6c085b584c216c2a5a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Josh Roberson <josh@asteriasgi.com>
+
+	* Makefile:  Update to fix non-responsive remote console on Darwin (OSX)(issue #5757)
+
 2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763)
@@ -40,7 +44,7 @@
 
 	* doc/README.variables: Add application exit status variables
 
-2005-11-14  Josh Roberson <josh@asteirasgi.com>
+2005-11-14  Josh Roberson <josh@asteriasgi.com>
 	
 	* manager.c: Fix crash on variable passing from AMI originate (issue #5737)
 
diff --git a/Makefile b/Makefile
index 1d4b7c222c8ce94a70ec188e5aafaa6befafaa05..c552d2181a63ee902a4279a155339177d0352a5f 100755
--- a/Makefile
+++ b/Makefile
@@ -363,6 +363,8 @@ ifeq ($(OSARCH),Darwin)
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+  OBJS+=poll.o
+  ASTCFLAGS+=-DPOLLCOMPAT
 else
 #These are used for all but Darwin
   ASTLINK=-Wl,-E