diff --git a/configure.ac b/configure.ac
index c44d28d..6b595e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,7 +203,7 @@ AM_CONDITIONAL([COND_THIRD_LIBSTDDJB],
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h langinfo.h limits.h locale.h netinet/in.h stddef.h stdint.h inttypes.h stdlib.h string.h sys/ioctl.h sys/resource.h sys/socket.h sys/time.h termios.h unistd.h wchar.h wctype.h], [], [AC_MSG_ERROR([Missing required header file.])])
 
-AC_CHECK_HEADERS([pty.h util.h libutil.h])
+AC_CHECK_HEADERS([pty.h util.h libutil.h paths.h])
 AC_CHECK_HEADERS([endian.h sys/endian.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
index f3327bf..fa8f93d 100644
--- a/src/frontend/mosh-server.cc
+++ b/src/frontend/mosh-server.cc
@@ -39,7 +39,10 @@
 #include <arpa/inet.h>
 #include <getopt.h>
 #include <time.h>
+
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 
 #include "sigfd.h"
 #include "completeterminal.h"
@@ -58,6 +61,10 @@
 #include <libutil.h>
 #endif
 
+#ifndef _PATH_BSHELL
+#define _PATH_BSHELL "/bin/sh"
+#endif
+
 #include "networktransport.cc"
 
 typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection;