diff --git a/ChangeLog b/ChangeLog
index 503fa11fea..b43856b5d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-01-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* conform/data/pthread.h-data: Make priority protocol related
+	functions optional.  Fix typos.
+
 	* posix/sched.h: Define sched_priority as __sched_priority.
 	* sysdeps/generic/bits/sched.h (struct sched_param): Rename element
 	to __sched_priority.
diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data
index cc881030c8..ef758eb7c5 100644
--- a/conform/data/pthread.h-data
+++ b/conform/data/pthread.h-data
@@ -4,15 +4,15 @@ constant PTHREAD_CANCEL_ENABLE
 constant PTHREAD_CANCEL_DEFERRED
 constant PTHREAD_CANCEL_DISABLE
 constant PTHREAD_CANCELED
-constant PTHREAD_COND_INITIALIZER
+macro PTHREAD_COND_INITIALIZER
 constant PTHREAD_CREATE_DETACHED
 constant PTHREAD_CREATE_JOINABLE
 constant PTHREAD_EXPLICIT_SCHED
 constant PTHREAD_INHERIT_SCHED
 constant PTHREAD_ONCE_INIT
-constant PTHREAD_PRIO_INHERIT
-constant PTHREAD_PRIO_NONE
-constant PTHREAD_PRIO_PROTECT
+optional-constant PTHREAD_PRIO_INHERIT
+optional-constant PTHREAD_PRIO_NONE
+optional-constant PTHREAD_PRIO_PROTECT
 constant PTHREAD_PROCESS_SHARED
 constant PTHREAD_PROCESS_PRIVATE
 constant PTHREAD_SCOPE_PROCESS
@@ -21,9 +21,9 @@ constant PTHREAD_SCOPE_SYSTEM
 constant PTHREAD_MUTEX_DEFAULT
 constant PTHREAD_MUTEX_ERRORCHECK
 constant PTHREAD_MUTEX_NORMAL
-constant PTHREAD_MUTEX_INITIALIZER
+macro PTHREAD_MUTEX_INITIALIZER
 constant PTHREAD_MUTEX_RECURSIVE
-constant PTHREAD_RWLOCK_INITILIZER
+macro PTHREAD_RWLOCK_INITIALIZER
 # endif
 
 type pthread_attr_t
@@ -76,18 +76,18 @@ macro pthread_cleanup_push
 macro pthread_cleanup_pop
 function int pthread_cond_broadcast (pthread_cond_t*)
 function int pthread_cond_destroy (pthread_cond_t*)
-function int pthread_cond_init (pthread_cond_t, const pthread_condattr_t*)
+function int pthread_cond_init (pthread_cond_t*, const pthread_condattr_t*)
 function int pthread_cond_signal (pthread_cond_t*)
 function int pthread_cond_timedwait (pthread_cond_t*, pthread_mutex_t*, const struct timespec*)
 function int pthread_cond_wait (pthread_cond_t*, pthread_mutex_t*)
 function int pthread_condattr_destroy (pthread_condattr_t*)
-function int pthread_condattr_getclock (const pthread_condattr_t*, clockid_t*)
+optional-function int pthread_condattr_getclock (const pthread_condattr_t*, clockid_t*)
 function int pthread_condattr_getpshared (const pthread_condattr_t*, int*)
 function int pthread_condattr_init (pthread_condattr_t*)
-function int pthread_condattr_setclock (const pthread_condattr_t*, clockid_t*)
+optional-function int pthread_condattr_setclock (const pthread_condattr_t*, clockid_t*)
 function int pthread_condattr_setpshared (pthread_condattr_t*, int)
 function int pthread_create (pthread_t*, const pthread_attr_t*, void *(*) (void*), void*)
-function int pthread_deteach (pthread_t)
+function int pthread_detach (pthread_t)
 function int pthread_equal (pthread_t, pthread_t)
 function int pthread_exit (void*)
 # ifndef POSIX
@@ -100,21 +100,21 @@ function int pthread_join (pthread_t, void**)
 function int pthread_key_create (pthread_key_t*, void (*)(void*))
 function int pthread_key_delete (pthread_key_t)
 function int pthread_mutex_destroy (pthread_mutex_t*)
-function int pthread_mutex_getprioceiling (const pthread_mutex_t*, int*)
+optional-function int pthread_mutex_getprioceiling (const pthread_mutex_t*, int*)
 function int pthread_mutex_init (pthread_mutex_t*, const pthread_mutexattr_t*)
 function int pthread_mutex_lock (pthread_mutex_t*)
-function int pthread_mutex_setprioceiling (pthread_mutex_t*, int, int*)
+optional-function int pthread_mutex_setprioceiling (pthread_mutex_t*, int, int*)
 function int pthread_mutex_timedlock (pthread_mutex_t*, const struct timespec*)
 function int pthread_mutex_trylock (pthread_mutex_t*)
 function int pthread_mutex_unlock (pthread_mutex_t*)
 function int pthread_mutexattr_destroy (pthread_mutexattr_t*)
-function int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t*, int*)
-function int pthread_mutexattr_getprotocol (const pthread_mutexattr_t*, int*)
+optional-function int pthread_mutexattr_getprioceiling (const pthread_mutexattr_t*, int*)
+optional-function int pthread_mutexattr_getprotocol (const pthread_mutexattr_t*, int*)
 function int pthread_mutexattr_getpshared (const pthread_mutexattr_t*, int*)
 function int pthread_mutexattr_gettype (const pthread_mutexattr_t*, int*)
 function int pthread_mutexattr_init (pthread_mutexattr_t*)
-function int pthread_mutexattr_setprioceiling (pthread_mutexattr_t*, int)
-function int pthread_mutexattr_setprotocol (pthread_mutexattr_t*, int)
+optional-function int pthread_mutexattr_setprioceiling (pthread_mutexattr_t*, int)
+optional-function int pthread_mutexattr_setprotocol (pthread_mutexattr_t*, int)
 function int pthread_mutexattr_setpshared (pthread_mutexattr_t*, int)
 function int pthread_mutexattr_settype (pthread_mutexattr_t*, int)
 function int pthread_once (pthread_once_t*, void (*) (void))
@@ -129,8 +129,8 @@ function int pthread_rwlock_unlock (pthread_rwlock_t*)
 function int pthread_rwlock_wrlock (pthread_rwlock_t*)
 function int pthread_rwlockattr_destroy (pthread_rwlockattr_t*)
 function int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t*, int*)
-function int pthread_rwlockattr_init (pthread_rwlockatttr*)
-function int pthread_rwlockattr_setpsahred (pthread_rwlockattr_t*, int)
+function int pthread_rwlockattr_init (pthread_rwlockattr_t*)
+function int pthread_rwlockattr_setpshared (pthread_rwlockattr_t*, int)
 # endif
 function pthread_t pthread_self (void)
 function int pthread_setcancelstate (int, int*)