diff --git a/core/org.eclipse.cdt.core.macosx/library/Makefile b/core/org.eclipse.cdt.core.macosx/library/Makefile
index a184aa5f8eb..215f7d6ded1 100644
--- a/core/org.eclipse.cdt.core.macosx/library/Makefile
+++ b/core/org.eclipse.cdt.core.macosx/library/Makefile
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2002, 2009 QNX Software Systems and others.
+# Copyright (c) 2002, 2015 QNX Software Systems and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -8,12 +8,13 @@
 # Contributors:
 #     QNX Software Systems - initial API and implementation
 #     Alex Blewitt - MacOSX with a 64-bit vm 
+# Martin Oberhuber (Wind River) - Bug 476709 - Fix change_window_size()
 #*******************************************************************************/
 
 # makefile for libspawner.so
 # See http://developer.apple.com/documentation/Java/Conceptual/Java141Development/Core_APIs/chapter_6_section_4.html
 
-JAVA_HOME = $(shell echo /Library/Java/JavaVirtualMachines/jdk1.8.0_*.jdk/Contents/Home)
+JAVA_HOME = $(shell echo /Library/Java/JavaVirtualMachines/jdk1.[78].0_*.jdk/Contents/Home)
 
 # Defaults which can be overridden.
 OS = macosx
diff --git a/core/org.eclipse.cdt.core.macosx/library/pty.c b/core/org.eclipse.cdt.core.macosx/library/pty.c
index e7c23e8fbc1..5d813bd0a79 100644
--- a/core/org.eclipse.cdt.core.macosx/library/pty.c
+++ b/core/org.eclipse.cdt.core.macosx/library/pty.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2009 QNX Software Systems and others.
+ * Copyright (c) 2002, 2015 QNX Software Systems and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -7,10 +7,13 @@
  *
  * Contributors:
  *     QNX Software Systems - initial API and implementation
+ * Martin Oberhuber (Wind River) - Bug 476709 - Fix change_window_size()
  *******************************************************************************/
 #include "PTY.h"
 #include "openpty.h"
 
+#include <sys/ioctl.h>
+
 /*
  * Class:     org_eclipse_cdt_utils_pty_PTY
  * Method:    forkpty
@@ -52,7 +55,7 @@ Java_org_eclipse_cdt_utils_pty_PTY_openMaster (JNIEnv *env, jobject jobj, jboole
 JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size
   (JNIEnv *env, jobject jobj, jint fdm, jint width, jint height)
 {
-#ifdef	TIOCGWINSZ
+#ifdef	TIOCSWINSZ
 	struct winsize win;
 
 	win.ws_col = width;
@@ -62,6 +65,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_cdt_utils_pty_PTY_change_1window_1size
 
 	return ioctl(fdm, TIOCSWINSZ, &win);
 #else
+#error no TIOCSWINSZ
 	return 0;
 #endif
 }
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib
index 49ad7a7f749..942b4bad8c4 100755
Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libpty.jnilib differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib
index 1377d5d2b58..dffccabbb60 100755
Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/x86/libspawner.jnilib differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib
old mode 100644
new mode 100755
index e0577a8079b..904d2369246
Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libpty.jnilib differ
diff --git a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib
old mode 100644
new mode 100755
index 06c3818a5ba..2d41d7d66ec
Binary files a/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib and b/core/org.eclipse.cdt.core.macosx/os/macosx/x86_64/libspawner.jnilib differ