diff --git a/config/oshmem_configure_options.m4 b/config/oshmem_configure_options.m4
index e90c4821de..83dd2b50c9 100644
--- a/config/oshmem_configure_options.m4
+++ b/config/oshmem_configure_options.m4
@@ -93,7 +93,7 @@ AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
 AC_ARG_ENABLE(oshmem-fortran,
 AC_HELP_STRING([--enable-oshmem-fortran],
                [enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
-if test "$enable_oshmem_fortran" != "no" -a "$ompi_fortran_happy" = 1; then
+if test "$enable_oshmem_fortran" != "no"; then
 # If no OMPI FORTRAN, bail
    AS_IF([test $OMPI_WANT_FORTRAN_BINDINGS -eq 0],
                [AC_MSG_RESULT([bad value OMPI_WANT_FORTRAN_BINDINGS: ($OMPI_WANT_FORTRAN_BINDINGS)])
@@ -107,7 +107,9 @@ else
     AC_MSG_RESULT([no])
     OSHMEM_FORTRAN_BINDINGS=0
 fi
-AM_CONDITIONAL(OSHMEM_WANT_FORTRAN_BINDINGS,
-    [test $OSHMEM_FORTRAN_BINDINGS -eq 1])
 
+#
+# We can't set am_conditional here since it's yet unknown if there is valid Fortran compiler avaliable
+#
+#
 ]) dnl
diff --git a/configure.ac b/configure.ac
index 4e0f18864a..1d5c72b093 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1273,6 +1273,9 @@ fi
 # a C++ compiler.
 AS_IF([test "$OMPI_WANT_FORTRAN_BINDINGS" != "1"],[F77=no FC=no])
 
+AM_CONDITIONAL(OSHMEM_WANT_FORTRAN_BINDINGS,
+    [test "$ompi_fortran_happy" == "1" -a "$OSHMEM_FORTRAN_BINDINGS" == "1"])
+
 LT_CONFIG_LTDL_DIR([opal/libltdl], [subproject])
 LTDL_CONVENIENCE
 LT_INIT([dlopen win32-dll])