diff --git a/Makefile b/Makefile
index 3a6a73f6b1e95aaa1bd2a5202c06afdc343f83f4..fc41003f5b341da2191f42770bf4ba440e3ed68f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-include $(FSLDIR)/etc/default.mk
+include $(FSLCONFDIR)/default.mk
 
 PROJNAME = siena
 
diff --git a/doc/siena b/doc/siena
index 2b1800cc1d11cf3b74518ce2ace5dea7c68c6017..8db468baec60783332aa5262bcd153d5a923d8c5 100755
--- a/doc/siena
+++ b/doc/siena
@@ -6,67 +6,7 @@
 #
 #   Copyright (C) 1999-2002 University of Oxford
 #
-#   Part of FSL - FMRIB's Software Library
-#   http://www.fmrib.ox.ac.uk/fsl
-#   fsl@fmrib.ox.ac.uk
-#   
-#   Developed at FMRIB (Oxford Centre for Functional Magnetic Resonance
-#   Imaging of the Brain), Department of Clinical Neurology, Oxford
-#   University, Oxford, UK
-#   
-#   
-#   LICENCE
-#   
-#   FMRIB Software Library, Release 3.0 (c) 2002, The University of Oxford
-#   (the "Software")
-#   
-#   The Software remains the property of the University of Oxford ("the
-#   University").
-#   
-#   The Software is distributed "AS IS" under this Licence solely for
-#   non-commercial use in the hope that it will be useful, but in order
-#   that the University as a charitable foundation protects its assets for
-#   the benefit of its educational and research purposes, the University
-#   makes clear that no condition is made or to be implied, nor is any
-#   warranty given or to be implied, as to the accuracy of the Software,
-#   or that it will be suitable for any particular purpose or for use
-#   under any specific conditions. Furthermore, the University disclaims
-#   all responsibility for the use which is made of the Software. It
-#   further disclaims any liability for the outcomes arising from using
-#   the Software.
-#   
-#   The Licensee agrees to indemnify the University and hold the
-#   University harmless from and against any and all claims, damages and
-#   liabilities asserted by third parties (including claims for
-#   negligence) which arise directly or indirectly from the use of the
-#   Software or the sale of any products based on the Software.
-#   
-#   No part of the Software may be reproduced, modified, transmitted or
-#   transferred in any form or by any means, electronic or mechanical,
-#   without the express permission of the University. The permission of
-#   the University is not required if the said reproduction, modification,
-#   transmission or transference is done without financial return, the
-#   conditions of this Licence are imposed upon the receiver of the
-#   product, and all original and amended source code is included in any
-#   transmitted product. You may be held legally responsible for any
-#   copyright infringement that is caused or encouraged by your failure to
-#   abide by these terms and conditions.
-#   
-#   You are not permitted under this Licence to use this Software
-#   commercially. Use for which any financial return is received shall be
-#   defined as commercial use, and includes (1) integration of all or part
-#   of the source code or the Software into a product for sale or license
-#   by or on behalf of Licensee to third parties or (2) use of the
-#   Software or any derivative of it for research with the final aim of
-#   developing software products for sale or license to a third party or
-#   (3) use of the Software or any derivative of it for research with the
-#   final aim of developing non-software products for sale or license to a
-#   third party, or (4) use of the Software to provide any service to an
-#   external organisation for which payment is received. If you are
-#   interested in using the Software commercially, please contact Isis
-#   Innovation Limited ("Isis"), the technology transfer company of the
-#   University, to negotiate a licence. Contact details are:
-#   innovation@isis.ox.ac.uk quoting reference DE/1112.
+#   SHCOPYRIGHT
 
 Usage() {
     echo ""
diff --git a/doc/sienax b/doc/sienax
index 44bd675e3672de1a70ade58fc7c1bc5f7487654f..70440ebb33962ee6484c0a8ef5ae648b83a955e0 100755
--- a/doc/sienax
+++ b/doc/sienax
@@ -6,67 +6,7 @@
 #
 #   Copyright (C) 1999-2002 University of Oxford
 #
-#   Part of FSL - FMRIB's Software Library
-#   http://www.fmrib.ox.ac.uk/fsl
-#   fsl@fmrib.ox.ac.uk
-#   
-#   Developed at FMRIB (Oxford Centre for Functional Magnetic Resonance
-#   Imaging of the Brain), Department of Clinical Neurology, Oxford
-#   University, Oxford, UK
-#   
-#   
-#   LICENCE
-#   
-#   FMRIB Software Library, Release 3.0 (c) 2002, The University of Oxford
-#   (the "Software")
-#   
-#   The Software remains the property of the University of Oxford ("the
-#   University").
-#   
-#   The Software is distributed "AS IS" under this Licence solely for
-#   non-commercial use in the hope that it will be useful, but in order
-#   that the University as a charitable foundation protects its assets for
-#   the benefit of its educational and research purposes, the University
-#   makes clear that no condition is made or to be implied, nor is any
-#   warranty given or to be implied, as to the accuracy of the Software,
-#   or that it will be suitable for any particular purpose or for use
-#   under any specific conditions. Furthermore, the University disclaims
-#   all responsibility for the use which is made of the Software. It
-#   further disclaims any liability for the outcomes arising from using
-#   the Software.
-#   
-#   The Licensee agrees to indemnify the University and hold the
-#   University harmless from and against any and all claims, damages and
-#   liabilities asserted by third parties (including claims for
-#   negligence) which arise directly or indirectly from the use of the
-#   Software or the sale of any products based on the Software.
-#   
-#   No part of the Software may be reproduced, modified, transmitted or
-#   transferred in any form or by any means, electronic or mechanical,
-#   without the express permission of the University. The permission of
-#   the University is not required if the said reproduction, modification,
-#   transmission or transference is done without financial return, the
-#   conditions of this Licence are imposed upon the receiver of the
-#   product, and all original and amended source code is included in any
-#   transmitted product. You may be held legally responsible for any
-#   copyright infringement that is caused or encouraged by your failure to
-#   abide by these terms and conditions.
-#   
-#   You are not permitted under this Licence to use this Software
-#   commercially. Use for which any financial return is received shall be
-#   defined as commercial use, and includes (1) integration of all or part
-#   of the source code or the Software into a product for sale or license
-#   by or on behalf of Licensee to third parties or (2) use of the
-#   Software or any derivative of it for research with the final aim of
-#   developing software products for sale or license to a third party or
-#   (3) use of the Software or any derivative of it for research with the
-#   final aim of developing non-software products for sale or license to a
-#   third party, or (4) use of the Software to provide any service to an
-#   external organisation for which payment is received. If you are
-#   interested in using the Software commercially, please contact Isis
-#   Innovation Limited ("Isis"), the technology transfer company of the
-#   University, to negotiate a licence. Contact details are:
-#   innovation@isis.ox.ac.uk quoting reference DE/1112.
+#   SHCOPYRIGHT
 
 Usage() {
     echo ""