diff --git a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
index 5eccb27a785..305e7e8e225 100644
--- a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.cdt.core.native;singleton:=true
-Bundle-Version: 5.8.0.qualifier
+Bundle-Version: 5.8.1.qualifier
 Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.cdt.core.native/pom.xml b/core/org.eclipse.cdt.core.native/pom.xml
index e99396a147f..18a30a98764 100644
--- a/core/org.eclipse.cdt.core.native/pom.xml
+++ b/core/org.eclipse.cdt.core.native/pom.xml
@@ -11,7 +11,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <version>5.8.0-SNAPSHOT</version>
+  <version>5.8.1-SNAPSHOT</version>
   <artifactId>org.eclipse.cdt.core.native</artifactId>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
index 8255597c43a..6bdfa8a68a2 100644
--- a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTYOutputStream.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 QNX Software Systems and others.
+ * Copyright (c) 2000, 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
@@ -15,9 +15,12 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import org.eclipse.cdt.utils.pty.PTY.MasterFD;
+import org.eclipse.core.runtime.Platform;
 
 public class PTYOutputStream extends OutputStream {
 
+	private static final byte EOT = '\4';
+
 	MasterFD master;
 
 	/**
@@ -69,6 +72,10 @@ public class PTYOutputStream extends OutputStream {
 	public void close() throws IOException {
 		if (master.getFD() == -1)
 			return;
+		// For non-windows platforms, send EOT before closing
+		if (!Platform.OS_WIN32.equals(Platform.getOS())) {
+			write(EOT);
+		}
 		int status = close0(master.getFD());
 		if (status == -1)
 			throw new IOException("close error"); //$NON-NLS-1$