diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 1fed088e06..48be8ff8e3 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-27	Joel Sherrill <joel@OARcorp.com>
+
+	PR 294/rtems
+	* src/pthread.c: POSIX thread exit handler now confirms that it created
+	the executing thread before implicitly exitting it.
+
 2004-05-21  Joel Sherrill <joel@OARcorp.com>
 
 	PR 628/rtems
diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c
index e91bcd4708..10193c849e 100644
--- a/cpukit/posix/src/pthread.c
+++ b/cpukit/posix/src/pthread.c
@@ -239,7 +239,12 @@ User_extensions_routine _POSIX_Threads_Exitted_extension(
   Thread_Control *executing
 )
 {
-  pthread_exit( executing->Wait.return_argument );
+  /*
+   *  If the executing thread was not created with the POSIX API, then this
+   *  API do not get to define its exit behavior.
+   */
+  if ( _Objects_Get_API( executing->Object.id ) == OBJECTS_POSIX_API )
+    pthread_exit( executing->Wait.return_argument );
 }
 
 /*PAGE