diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b7effb155a5..defc5250efc 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-06  Mark Wielaard  <mark@klomp.org>
+
+	* java/lang/Thread.java (setDaemon): Check startable_flag,
+	not isAlive().
+
 2002-10-07  Michael Koch  <konqueror@gmx.de>
 
 	* java/nio/Buffer.java: New stub file.
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java
index 64d58dda080..18af8292126 100644
--- a/libjava/java/lang/Thread.java
+++ b/libjava/java/lang/Thread.java
@@ -137,7 +137,7 @@ public class Thread implements Runnable
   public final void setDaemon (boolean status)
   {
     checkAccess ();
-    if (isAlive ())
+    if (!startable_flag)
       throw new IllegalThreadStateException ();
     daemon_flag = status;
   }