diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6aee33f3701baa35ecd6e2891cb0b58cda147737..3b4e8e7acc4067cbca69324f2bd82b6522ef8578 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,7 @@
 2000-03-27  Bryce McKinlay  <bryce@albatross.co.nz>
 
 	* Makefile.in: New #defines and friends for Thread.h.
+	* Makefile.am: Ditto.
 	* posix-threads.cc: (struct starter): Remove `object'.
 	(_Jv_CondWait): Use interruptable condition variables and new
 	recursive mutexes. New return codes on interrupt or non-ownership
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 4d0a16aa79d3051685fc737d8eb4f5f749792aa2..5a60b813c726020808a201e4a6b07cb8ab997884 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -224,11 +224,15 @@ gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip
 java/lang/Thread.h: java/lang/Thread.class libgcj.zip
 	$(GCJH) -classpath $(top_builddir) \
 		-prepend 'class _Jv_JNIEnv;' \
-## Eww.
 		-prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \
+		-prepend '#define _JV_NOT_OWNER 1' \
+		-prepend '#define _JV_INTERRUPTED 2' \
 		-friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
 		-friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
 		-friend 'class gnu::gcj::jni::NativeThread;' \
+		-friend 'int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos);' \
+		-friend 'int _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu);' \
+		-friend 'void _Jv_ThreadInterrupt (_Jv_Thread_t *data);' \
 		$(basename $<)
 
 java/lang/String.h: java/lang/String.class libgcj.zip