diff --git a/com.oracle.truffle.r.native/gnur/Makefile.gnur b/com.oracle.truffle.r.native/gnur/Makefile.gnur
index 62071263f0a093d53956dba2244043416e70cdae..29c57579c3e0d2c0f96e5eca81d56583072cf3ab 100644
--- a/com.oracle.truffle.r.native/gnur/Makefile.gnur
+++ b/com.oracle.truffle.r.native/gnur/Makefile.gnur
@@ -81,8 +81,8 @@ ifeq ($(OSNAME), SunOS)
     ICONV := libiconv-1.14
     $(shell mkdir -p iconv_install)
     ICONV_INSTALL := $(abspath iconv_install)
-    ICONV_CFLAGS := "$(CFLAGS) -m64 -xcode=pic32 -I$(ICONV_INSTALL)/include"
-    ICONV_LDFLAGS := -L$(ICONV_INSTALL)/lib 
+    ICONV_CFLAGS := "$(CFLAGS) -m64 -xcode=pic32 -I$(ICONV_INSTALL)/include -I$(XZ_HOME)/include"
+    ICONV_LDFLAGS := "-m64 -L$(ICONV_INSTALL)/lib -L$(XZ_HOME)/lib"
     ICONV_CONFIG_FLAGS := CC=cc CXX=CC CFLAGS=$(ICONV_CFLAGS) LDFLAGS=$(ICONV_LDFLAGS)
 # required for Solaris compiler >=12.2, see Appendix C of R installation guide: 
 # http://cran.r-project.org/doc/manuals/r-release/R-admin.html#Solaris 
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 63ef682bce091569d03d3224022cd192b0b5428a..c98dfe69d87a8cfc01f3ccf3d96fd822d5884463 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -344,8 +344,8 @@ suite = {
            },
         },
          "solaris" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/solaris/amd64/fastr-unit-tests-native.jar",
+           "sparcv9" : {
+             "path" : "mxbuild/dists/solaris/sparcv9/fastr-unit-tests-native.jar",
            }
         },
       },
@@ -370,8 +370,8 @@ suite = {
           },
         },
          "solaris" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/solaris/amd64/fastr-native-dev.jar",
+           "sparcv9" : {
+             "path" : "mxbuild/dists/solaris/sparcv9/fastr-native-dev.jar",
           },
         },
       },
@@ -392,8 +392,8 @@ suite = {
            }
         },
          "solaris" : {
-           "amd64" : {
-             "path" : "mxbuild/dists/solaris/amd64/fastr-release.jar",
+           "sparcv9" : {
+             "path" : "mxbuild/dists/solaris/sparcv9/fastr-release.jar",
            }
         },
       },