diff --git a/build.sh b/build.sh
index 203c81761..477652402 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 export iraf=`pwd`/
-export host=unix
+export host=unix/
 export hlib=${iraf}${host}/hlib/
 export PATH=$PATH:${iraf}${host}"/bin/"
 export pkglibs=${iraf}noao/lib/,${iraf}${host}/hlib/libc/,${iraf}${host}/bin/
@@ -7,6 +7,7 @@ export HOST_CURL=1
 export HOST_READLINE=1
 export HOST_EXPAT=1
 export HOST_CFITSIO=1
+export HOST_XMLRPC=1
 export IRAFARCH=`${hlib}irafarch.csh`
 
 rm -rf vo/votools/.old
@@ -41,7 +42,7 @@ popd
 
 export pkglibs=${iraf}noao/lib/,${iraf}${host}/bin/,${iraf}${host}/hlib/libc/
 ${iraf}util/mksysvos
-sed -i ${host}/hlib/mkiraf.csh -e s!/iraf/iraf!%{_datadir}/iraf!g
+sed -i ${host}/hlib/mkiraf.csh -e s!/iraf/iraf!%{_libdir}/iraf!g
 cp ${iraf}${host}/bin/*.a ${iraf}lib
 rm pkg/utilities/nttools/xx_nttools.e
 
diff --git a/unix/boot/spp/xc.c b/unix/boot/spp/xc.c
index 747988448..c7e299723 100644
--- a/unix/boot/spp/xc.c
+++ b/unix/boot/spp/xc.c
@@ -1265,6 +1265,9 @@ passflag:		    mkobject = YES;
 #endif
 #ifdef HOST_EXPAT
 	arglist[nargs++] = "-lexpat";
+#endif
+#ifdef HOST_XMLRPC
+	arglist[nargs++] = "-lxmlrpc";
 #endif
 	/* Host libraries, searched after iraf libraries. */
 	for (i=0;  i < nhlibs;  i++)
diff --git a/unix/hlib/irafuser.csh b/unix/hlib/irafuser.csh
index 6190f9e9b..a6bccde37 100755
--- a/unix/hlib/irafuser.csh
+++ b/unix/hlib/irafuser.csh
@@ -124,7 +124,7 @@ case ipad:
 case linux64:
     setenv XC_CFLAGS "-I${iraf}unix/f2c"
     setenv XC_FFLAGS "-I${iraf}unix/f2c"
-    setenv HSI_CF "-I${iraf}unix/f2c -g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
+    setenv HSI_CF "-I${iraf}unix/f2c -g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC -DHOST_CFITSIO"
     setenv HSI_XF "-I${iraf}unix/f2c -g -Inolibc -I${hlib}libc -w -/m64 -/Wunused"
     setenv HSI_FF "-I${iraf}unix/f2c -g -m64 -DBLD_KERNEL"
     setenv HSI_LF "-m64 "
diff --git a/vendor/voclient/libsamp/libxrpc/mklibs b/vendor/voclient/libsamp/libxrpc/mklibs
index f9d0daa9a..f0f4f2997 100755
--- a/vendor/voclient/libsamp/libxrpc/mklibs
+++ b/vendor/voclient/libsamp/libxrpc/mklibs
@@ -10,7 +10,7 @@ setenv PLATFORM	`uname -s`
 setenv PLMACH	`uname -m`
 
 set	build_curl	= 0
-set	build_xmlrpc	= 1
+set	build_xmlrpc	= 0
 
 
 if ($PLATFORM == "Darwin") then