Index: commerce_registration.module
===================================================================
--- commerce_registration.module	(revision 8)
+++ commerce_registration.module	(working copy)
@@ -374,7 +374,14 @@
           if (!$showavail) {
             unset($form['capacity']);
           }
-          if (registration_has_room('commerce_product', $product->product_id)) {
+		  $errors = array();
+          if (registration_status('commerce_product', $product->product_id, FALSE, 1, NULL, $errors)) {
+		    if (in_array(t('insufficient spaces remaining'), $errors) && count($errors) == 1) {
+				$form['capacity'] = array(
+					'#type' => 'markup',
+					'#markup' => '<em>Wait listed places available<br>We can place you on another course later</em>',
+				);
+			}
             $form['submit'] = $submit;
           }
           else {