diff --git a/Utils.cpp b/Utils.cpp
index cf7069f9..ed28fc2f 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -177,7 +177,11 @@ CString CUtils::SaltedSHA256Hash(const CString& sPass, const CString& sSalt) {
 
 CString CUtils::GetPass(const CString& sPrompt) {
 	PrintPrompt(sPrompt);
+#ifdef HAVE_GETPASSPHRASE
+	return getpassphrase("");
+#else
 	return getpass("");
+#endif
 }
 
 bool CUtils::GetBoolInput(const CString& sPrompt, bool bDefault) {
diff --git a/configure.ac b/configure.ac
index 8206f3d2..078a3d0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ case "${host_os}" in
 		appendMod -L/usr/local/lib
 	;;
 	solaris*)
-		appendLib -lsocket -lnsl
+		appendLib -lsocket -lnsl -lresolv
 		ISSUN=1
 	;;
 	cygwin)
@@ -181,7 +181,7 @@ if test "$POLL" = "yes"; then
 fi
 
 AC_CHECK_LIB( gnugetopt, getopt_long,)
-AC_CHECK_FUNCS([lstat getopt_long])
+AC_CHECK_FUNCS([lstat getopt_long getphassphrase])
 PKG_PROG_PKG_CONFIG()
 
 # ----- Check for dlopen