diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c
index 80682defbf..53ccb53aaf 100644
--- a/ompi/mca/btl/openib/btl_openib_mca.c
+++ b/ompi/mca/btl/openib/btl_openib_mca.c
@@ -14,6 +14,7 @@
  * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved.
  * Copyright (c) 2006-2007 Voltaire All rights reserved.
+ * Copyright (c) 2009      Sun Microsystems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -171,16 +172,16 @@ int btl_openib_register_mca_params(void)
                   "Whether fork support is desired or not "
                   "(negative = try to enable fork support, but continue even if it is not available, 0 = do not enable fork support, positive = try to enable fork support and fail if it is not available)",
                   ival2, &ival, 0));
-    if (OMPI_HAVE_IBV_FORK_INIT) {
-        mca_btl_openib_component.want_fork_support = ival;
-    } else {
-        if (0 != ival) {
-            orte_show_help("help-mpi-btl-openib.txt",
-                           "ibv_fork requested but not supported", true,
-                           orte_process_info.nodename);
-            return OMPI_ERROR;
-        }
+#ifdef HAVE_IBV_FORT_INIT
+    mca_btl_openib_component.want_fork_support = ival;
+#else
+    if (0 != ival) {
+        orte_show_help("help-mpi-btl-openib.txt",
+                       "ibv_fork requested but not supported", true,
+                       orte_process_info.nodename);
+        return OMPI_ERROR;
     }
+#endif
 
     asprintf(&str, "%s/mca-btl-openib-device-params.ini",
              opal_install_dirs.pkgdatadir);