diff --git a/configure.ac b/configure.ac
index c790688981..99b530c8b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1093,6 +1093,16 @@ AC_INCLUDES_DEFAULT
 #include <sys/resource.h>
 #endif])
 
+#
+# Do we have RLIMIT_AS in <sys/resources.h>? (e.g., Solaris does not)
+#
+
+AC_CHECK_DECLS([RLIMIT_AS], [], [], [
+AC_INCLUDES_DEFAULT
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif])
+
 # checkpoint results
 AC_CACHE_SAVE
 
diff --git a/opal/util/sys_limits.c b/opal/util/sys_limits.c
index 485c77a5c9..0388b781c4 100644
--- a/opal/util/sys_limits.c
+++ b/opal/util/sys_limits.c
@@ -212,7 +212,6 @@ int opal_util_init_sys_limits(char **errmsg)
         }
     }
 
- cleanup:
     if (NULL != lim) {
         opal_argv_free(lim);
     }