diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog
index 0f8831df3f..ad90f99f63 100644
--- a/cpukit/posix/ChangeLog
+++ b/cpukit/posix/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  Joel Sherrill <joel@OARcorp.com>
+
+	PR 629/rtems
+	* src/mqueuecreatesupp.c: Return EINVAL is mq_maxmsg is <= 0, not <.
+
 2004-02-26	Joel Sherrill <joel@OARcorp.com>
 
 	PR 582/core
diff --git a/cpukit/posix/src/mqueuecreatesupp.c b/cpukit/posix/src/mqueuecreatesupp.c
index 091da0de87..cf7f040e41 100644
--- a/cpukit/posix/src/mqueuecreatesupp.c
+++ b/cpukit/posix/src/mqueuecreatesupp.c
@@ -76,12 +76,12 @@ int _POSIX_Message_queue_Create_support(
     attr.mq_maxmsg  = 10;
     attr.mq_msgsize = 16;
   } else {
-    if ( attr_ptr->mq_maxmsg < 0 ){
+    if ( attr_ptr->mq_maxmsg <= 0 ){
       _Thread_Enable_dispatch();
       rtems_set_errno_and_return_minus_one( EINVAL );
     }
 
-    if ( attr_ptr->mq_msgsize < 0 ){
+    if ( attr_ptr->mq_msgsize <= 0 ){
       _Thread_Enable_dispatch();
       rtems_set_errno_and_return_minus_one( EINVAL );
     }