diff --git a/Makefile.in b/Makefile.in
index fe63a80d..2ad58660 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -129,6 +129,8 @@ EXEEXT=@EXEEXT@
 
 STATIC=@STATIC@
 
+MV=@MV@
+
 # whether we're building client, server, or both for the common objects.
 # evilness so we detect 'dropbear' by itself as a word
 ifneq (,$(strip $(foreach prog, $(PROGRAMS), $(findstring ZdropbearZ, Z$(prog)Z))))
@@ -177,7 +179,7 @@ default_options_guard.h: $(srcdir)/default_options.h
 	@echo Creating $@
 	@printf "/*\n > > > Do not edit this file (default_options_guard.h) < < <\nGenerated from "$^"\nLocal customisation goes in localoptions.h\n*/\n\n" > $@.tmp
 	@$(srcdir)/ifndef_wrapper.sh < $^ >> $@.tmp
-	mv -v $@.tmp $@
+	$(MV) -v $@.tmp $@
 	pwd
 	ls -l $@
 
diff --git a/configure b/configure
index 13c911ef..528b02e1 100755
--- a/configure
+++ b/configure
@@ -672,6 +672,7 @@ build_os
 build_vendor
 build_cpu
 build
+MV
 STATIC
 DROPBEAR_LTM_CFLAGS
 LTM_CFLAGS
@@ -4598,6 +4599,15 @@ rm -rf conftest*
 fi
 
 
+# Default mv
+# We can edit mv's path, it's usefull on systems where the gnu
+# coreutils are not the default implementation. For example on Illumos and
+# Solaris, the default mv does not have the -v option (verbose). But on Solaris
+# and most Illumos distros, the gnu coreutils are shipped under /usr/gnu, where
+# we can find mv under the bin/ directory.
+MV="mv"
+
+
 # Host specific options
 # this isn't a definitive list of hosts, they are just added as required
 
@@ -4685,8 +4695,7 @@ case "$host" in
 
 *-*-solaris*)
 	CFLAGS="$CFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
-	conf_lastlog_location="/var/adm/lastlog"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -lssp"
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for obsolete utmp and wtmp in solaris2.x" >&5
 printf %s "checking for obsolete utmp and wtmp in solaris2.x... " >&6; }
 	sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'`
@@ -4783,6 +4792,8 @@ then :
   LIBS="$LIBS -lnsl"
 fi
 
+	MV="/usr/gnu/bin/mv"
+
 	;;
 
 *-*-aix*)
diff --git a/configure.ac b/configure.ac
index 674fd4d8..8c911780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,14 @@ AC_ARG_ENABLE(werror,
 # large file support is useful for scp
 AC_SYS_LARGEFILE
 
+# Default mv
+# We can edit mv's path, it's usefull on systems where the gnu
+# coreutils are not the default implementation. For example on Illumos and
+# Solaris, the default mv does not have the -v option (verbose). But on Solaris
+# and most Illumos distros, the gnu coreutils are shipped under /usr/gnu, where
+# we can find mv under the bin/ directory.
+AC_SUBST(MV,["mv"])
+
 # Host specific options
 # this isn't a definitive list of hosts, they are just added as required
 AC_CANONICAL_HOST
@@ -160,8 +168,7 @@ case "$host" in
 
 *-*-solaris*)
 	CFLAGS="$CFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
-	conf_lastlog_location="/var/adm/lastlog"
+	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib -lssp"
 	AC_MSG_CHECKING(for obsolete utmp and wtmp in solaris2.x)
 	sol2ver=`echo "$host"| sed -e 's/.*[[0-9]]\.//'`
 	if test "$sol2ver" -ge 8; then
@@ -173,6 +180,7 @@ case "$host" in
 	fi
 	AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 	AC_CHECK_LIB(nsl, yp_match, LIBS="$LIBS -lnsl")
+	AC_SUBST(MV,["/usr/gnu/bin/mv"])
 	;;
 
 *-*-aix*)
diff --git a/src/dbhelpers.h b/src/dbhelpers.h
index 551bcb48..79619948 100644
--- a/src/dbhelpers.h
+++ b/src/dbhelpers.h
@@ -16,6 +16,8 @@
 #define ATTRIB_SENTINEL
 #endif
 
+#define __STDC_WANT_LIB_EXT1__ 1
+
 void m_burn(void* data, unsigned int len);
 
 #endif /* DROPBEAR_DBHELPERS_H_ */