diff --git a/libs/iksemel/configure.ac b/libs/iksemel/configure.ac
index e00af1fb99..49d8621777 100644
--- a/libs/iksemel/configure.ac
+++ b/libs/iksemel/configure.ac
@@ -83,9 +83,13 @@ AC_ARG_ENABLE(64,
 
 if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
     if test "${enable_64}" = "yes"; then
-        CFLAGS="$CFLAGS -m64 -lgpg-error"
-        CXXFLAGS="$CXXFLAGS -m64 -lgpg-error"
-	SUNFLAGS="-lgpg.error"
+        CFLAGS="$CFLAGS -xc99=all -mt -m64 -lgpg-error"
+        CXXFLAGS="$CXXFLAGS -xc99=all -mt -m64 -lgpg-error"
+	SUNFLAGS="-xc99=all -mt -m64 -lgpg-error"
+    else 
+	CFLAGS="$CFLAGS -xc99=all -mt -lgpg-error"
+	CXXFLAGS="$CXXFLAGS -xc99=all -mt -lgpg-error"
+	SUNFLAGS="-xc99=all -mt -lgpg-error"
     fi
 fi
 
diff --git a/libs/iksemel/src/Makefile.am b/libs/iksemel/src/Makefile.am
index 20ca2630aa..10236f6deb 100644
--- a/libs/iksemel/src/Makefile.am
+++ b/libs/iksemel/src/Makefile.am
@@ -25,5 +25,5 @@ libiksemel_la_SOURCES = \
 	base64.c
 
 libiksemel_la_LDFLAGS = -version-info 4:0:1 -no-undefined
-libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)
-libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)
+libiksemel_la_CFLAGS = $(CFLAGS) $(LIBGNUTLS_CFLAGS)  @SUNCFLAGS@
+libiksemel_la_LIBADD = $(LIBGNUTLS_LIBS)  @SUNCFLAGS@