diff -ur a/configure b/configure
--- a/configure	2011-11-29 10:42:28.000000000 +0100
+++ b/configure	2012-06-20 14:51:04.647088600 +0200
@@ -3267,6 +3267,9 @@
     *linux*)
         SUN_EXTRA_INCLUDE="linux"
         ;;
+    *solaris*)
+        SUN_EXTRA_INCLUDE="solaris"
+        ;;
 esac
 
 ### adapting build environment for different platforms...
diff -ur a/lasso/logging.c b/lasso/logging.c
--- a/lasso/logging.c	2010-12-14 15:18:58.000000000 +0100
+++ b/lasso/logging.c	2012-06-20 14:33:54.147731800 +0200
@@ -25,6 +25,7 @@
 #include "./logging.h"
 #include "./lasso_config.h"
 #include <glib.h>
+#include <time.h>
 
 void
 lasso_log(GLogLevelFlags level, const char *filename, int line,
diff -ur a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
--- a/lasso/saml-2.0/provider.c	2011-11-29 10:19:50.000000000 +0100
+++ b/lasso/saml-2.0/provider.c	2012-06-20 14:33:36.871037900 +0200
@@ -348,7 +348,8 @@
 		LASSO_SAML2_METADATA_ATTRIBUTE_CACHE_DURATION,
 		LASSO_SAML2_METADATA_ATTRIBUTE_AUTHN_REQUEST_SIGNED,
 		LASSO_SAML2_METADATA_ATTRIBUTE_WANT_AUTHN_REQUEST_SIGNED,
-		LASSO_SAML2_METADATA_ATTRIBUTE_ERROR_URL
+		LASSO_SAML2_METADATA_ATTRIBUTE_ERROR_URL,
+		NULL
 	};
 	int i;
 	xmlNode *t;