diff --git a/lustre/configure.in b/lustre/configure.in
index 9365acb77b65d5e0d012b8f8ab8e80c9702b844c..511d389e1a3d41f3d9a6f41bb4e0e1dd28cbb2de 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -54,10 +54,13 @@ AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to
 PORTALS=$enable_portalsdir
 AC_SUBST(PORTALS)
 
-portalslib_def='$(top_srcdir)/../portals'
 AC_ARG_WITH(portalslib, [  --with-portalslib=[path] set path to Portals library (default=../portals/linux/utils)], enable_portalslib=$withval)
-AC_ARG_ENABLE(portalslib, [  --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib=$portalslib_def)
-PORTALSLIB=$enable_portalslib/linux/utils
+AC_ARG_ENABLE(portalslib, [  --enable-portalslib=[path] (deprecated) set path to Portals lib (default=../portals/linux/utils)],, enable_portalslib='')
+if test -z "$enable_portalslib"; then
+  PORTALSLIB=${PORTALS}/linux/utils
+else
+  PORTALSLIB=${enable_portalslib}
+fi
 AC_SUBST(PORTALSLIB)
 
 AC_MSG_CHECKING(if make dep has been run in kernel source)
diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 85d4c81246462271d883226fe893c7b5058adc47..2b5b786ba907281c0b711aa05b315d5150059221 100644
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -3,6 +3,7 @@
 %define kversion @RELEASE@
 %define linuxdir @LINUX@
 %define portalsdir @PORTALS@
+%define portalslibdir @PORTALSLIB@
 Release: 0208282230chaos
 
 Summary: Lustre Lite File System
@@ -49,7 +50,7 @@ Documentation and sample configuration files for Lustre
 rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
-./configure --enable-linuxdir='%{linuxdir}' --enable-portalsdir='%{portalsdir}'
+./configure --with-linux='%{linuxdir}' --with-portals='%{portalsdir}' --with-portalslib='%{portalslibdir}'
 make
 
 %install
@@ -65,11 +66,12 @@ make distdir distdir=lustre-source/lustre-%{version}
 %attr(-, root, root) /usr/sbin/lmc
 %attr(-, root, root) /usr/sbin/lctl
 %attr(-, root, root) /usr/sbin/lconf
-%attr(-, root, root) /usr/sbin/llsetup.sh
-%attr(-, root, root) /usr/sbin/llrsetup.sh
-%attr(-, root, root) /usr/sbin/llcleanup.sh
-%attr(-, root, root) /lib/lustre/common.sh
-%attr(-, root, root) /etc/lustre/lustre.cfg
+%attr(-, root, root) /usr/lib/lustre/examples/llmount.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llmountcleanup.sh
+%attr(-, root, root) /usr/lib/lustre/examples/llecho.sh
+%attr(-, root, root) /usr/lib/lustre/examples/local.sh
+%attr(-, root, root) /usr/lib/lustre/examples/uml.sh
+%attr(-, root, root) /usr/lib/lustre/examples/lov.sh
 %attr(-, root, root) /etc/init.d/lustre
 
 %files -n lustre-doc
diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 58aee952ade521420282900369ad80146c816ab2..305c0c4ce0172d6b242899a52f42fbb4095afe1e 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -4,25 +4,23 @@ CPPFLAGS = -I. -I$(PORTALS)/include -I$(top_srcdir)/include -D_LARGEFILE64_SOURC
 CFLAGS := -g -Wall
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
-pkglibdir = @libdir@/$(PACKAGE)
-pkgcfgdir = @sysconfdir@/$(PACKAGE)
-EXTRA_DIST = $(sbin_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
+EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
 	common.sh lustre.cfg \
 	client-echo.cfg    elan-server.cfg  net-client.cfg  obdecho.cfg \
 	client-mount.cfg   ldlm.cfg         net-local.cfg   obdfilter.cfg \
 	client-mount2.cfg  lustre.cfg       net-server.cfg \
 	elan-client.cfg    mds.cfg 	trivial.sh
-sbin_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
-noinst_DATA = ext2_10000.gz ext2_25000.gz ext3_10000.gz lov.xml
+pkgexampledir = '${exec_prefix}/usr/lib/$(PACKAGE)/examples'
+pkgexample_SCRIPTS = llmount.sh llmountcleanup.sh llecho.sh local.sh uml.sh lov.sh
+noinst_SCRIPTS = llsetup.sh llrsetup.sh llcleanup.sh
+noinst_DATA = ext2_10000.gz ext2_25000.gz ext3_10000.gz lov.xml lustre.cfg
 noinst_SCRIPTS = fs.sh intent-test.sh intent-test2.sh leak_finder.pl \
 	lldlm.sh llecho.sh llext3.sh llmodules.sh llmount-client.sh \
 	llmount-server.sh llmount.sh llmountcleanup.sh llrext3.sh \
 	llrmount.sh llsimple.sh  mdcreq.sh mdcreqcleanup.sh \
 	ostreq.sh runfailure-client-mds-recover.sh runfailure-mds \
 	runfailure-net runfailure-ost runiozone runregression-net.sh \
-	runtests runvmstat snaprun.sh tbox.sh
-pkglib_SCRIPTS = common.sh
-pkgcfg_DATA = lustre.cfg
+	runtests runvmstat snaprun.sh tbox.sh  common.sh
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme mcreate
 noinst_PROGRAMS += munlink tchmod toexcl fsx test_brw openclose createdestroy
 noinst_PROGRAMS += lovstripe # ldaptest