ompi/tools/ompi-server/Makefile.am | 2 ++
 orte/runtime/orte_mca_params.c     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ompi/tools/ompi-server/Makefile.am b/ompi/tools/ompi-server/Makefile.am
index 9a3eff0..fbcc361 100644
--- a/ompi/tools/ompi-server/Makefile.am
+++ b/ompi/tools/ompi-server/Makefile.am
@@ -42,6 +42,8 @@ endif # OMPI_INSTALL_BINARIES
 
 ompi_server_SOURCES = ompi-server.c 
 ompi_server_LDADD = $(top_builddir)/ompi/libmpi.la
+ompi_server_LDADD += $(top_builddir)/opal/libopen-pal.la
+ompi_server_LDADD += $(top_builddir)/orte/libopen-rte.la
 
 distclean-local:
 	rm -f $(man_pages)
diff --git a/orte/runtime/orte_mca_params.c b/orte/runtime/orte_mca_params.c
index 91a749f..3d170bc 100644
--- a/orte/runtime/orte_mca_params.c
+++ b/orte/runtime/orte_mca_params.c
@@ -225,7 +225,7 @@ int orte_register_params(void)
                                 false, false, 1000, &orte_timeout_usec_per_proc);
     
     /* default hostfile */
-    asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
+    asprintf(&orte_default_hostfile, "/etc/openmpi/openmpi-default-hostfile", opal_install_dirs.prefix);
     mca_base_param_reg_string_name("orte", "default_hostfile",
                                    "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
                                    false, false, orte_default_hostfile, &orte_default_hostfile);