diff --git a/Modules.changes b/Modules.changes
index b7bc493..21654d6 100644
--- a/Modules.changes
+++ b/Modules.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Sep 10 08:30:51 UTC 2012 - kkaempf@suse.com
+
+- complete the move from /usr/Modules to /usr/share/Modules
+  (bnc#778525)
+
+-------------------------------------------------------------------
+Wed Aug 29 20:11:14 UTC 2012 - alinm.elena@gmail.com
+
+- update to 3.2.9c 
+  * Fix the coexistence of load/remove flags (Martin Siegert)
+  * Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski)
+  * Isolated calls to the new interpreter and get & set env.vars.
+  * Crucial bug fix of same by (Orion Poplawski).
+  * Optionally use Tcl memory check routines for malloc/realloc.
+  * Fixed the "module purge" memory corruption (Poor Yorick)
+  * Added support for Ruby (Tammo Tjarks)
+- replace defaut in the profile files with the proper version
+- make module files from /etc %config 
+
 -------------------------------------------------------------------
 Thu Dec  1 11:19:55 UTC 2011 - coolo@suse.com
 
diff --git a/Modules.spec b/Modules.spec
index 9757b57..88d7951 100644
--- a/Modules.spec
+++ b/Modules.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Modules
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           Modules
 BuildRequires:  automake
 BuildRequires:  tcl-devel
 # xorg-x11-devel
 Url:            http://modules.sourceforge.net/
-Version:        3.2.8
+Version:        3.2.9
 Release:        0
 Summary:        Environment Modules
 License:        BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+
 Group:          System/Management
-Requires:       tcl 
-Source:         modules-%{version}a.tar.bz2
-Patch:          modules-%{version}.patch
+Requires:       tcl
+Source:         modules-%{version}c.tar.bz2
+# PATCH-FIX-OPENSUSE share.patch
+Patch0:         share.patch
+# PATCH-FIX-UPSTREAM return.patch 
+Patch1:         return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       environment-modules
 Obsoletes:      environment-modules
@@ -55,7 +59,8 @@ Authors:
 
 %prep
 %setup -q -n modules-%{version}
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 aclocal --force -I config
@@ -76,6 +81,9 @@ install -d $RPM_BUILD_ROOT/usr/share/modules
 install -d $RPM_BUILD_ROOT/etc/profile.d
 install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh
 install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
+sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh
+sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh
+
 make DESTDIR=$RPM_BUILD_ROOT install
 install -d $RPM_BUILD_ROOT/usr/bin
 pushd $RPM_BUILD_ROOT/usr/bin
@@ -95,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/modules
 /usr/share/modules/*
 %{_bindir}/*
-/etc/profile.d/modules.*
+%config /etc/profile.d/modules.*
 %doc %{_mandir}/man4/*
 %doc %{_mandir}/man1/*
 
diff --git a/modules-3.2.8.patch b/modules-3.2.8.patch
deleted file mode 100644
index 340fcd8..0000000
--- a/modules-3.2.8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac
---- ../orig-modules-3.2.8/configure.ac	2010-10-04 17:59:50.000000000 +0200
-+++ ./configure.ac	2011-10-18 14:50:35.000000000 +0200
-@@ -110,10 +110,10 @@
- fi
- if test "$prefix" != "NONE" ; then
-   if test "$WANTS_VERSIONING" -eq 1 ; then
--    DEFAULTPATH=$prefix/Modules/default
--    NODEFAULTPATH=$prefix/Modules/$VERSION
-+    DEFAULTPATH=$prefix/share/Modules/default
-+    NODEFAULTPATH=$prefix/share/Modules/$VERSION
-     BASEPREFIX=$prefix
--    prefix=$BASEPREFIX/Modules/$VERSION
-+    prefix=$BASEPREFIX/share/Modules/$VERSION
-     export prefix
-   else
-     DEFAULTPATH=$prefix/Modules
-@@ -125,10 +125,10 @@
-   PREFIX=$prefix
- else
-   if test "$WANTS_VERSIONING" -eq 1 ; then
--    DEFAULTPATH=$ac_default_prefix/Modules/default
--    NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
-+    DEFAULTPATH=$ac_default_prefix/share/Modules/default
-+    NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
-     BASEPREFIX=$ac_default_prefix
--    ac_default_prefix=$BASEPREFIX/Modules/$VERSION
-+    ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
-     export ac_default_prefix
-   else
-     DEFAULTPATH=$ac_default_prefix/Modules
-diff -wruN -x '*~' ../orig-modules-3.2.8/ModuleCmd_Avail.c ./ModuleCmd_Avail.c
---- ../orig-modules-3.2.8/ModuleCmd_Avail.c	2010-07-27 21:09:05.000000000 +0200
-+++ ./ModuleCmd_Avail.c	2011-10-18 12:21:15.000000000 +0200
-@@ -680,6 +680,7 @@
- 
- static int	test_version_dir(	struct dirent	*dp)
- {
-+	return 0;
- }
- /*++++
-  ** ** Function-Header ***************************************************** **
diff --git a/modules-3.2.8a.tar.bz2 b/modules-3.2.8a.tar.bz2
deleted file mode 100644
index 7e127d3..0000000
--- a/modules-3.2.8a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c47d18aa29b94c5964a79e0dc06facb928911355ab904aa27955cb39ec4173f
-size 336840
diff --git a/modules-3.2.9c.tar.bz2 b/modules-3.2.9c.tar.bz2
new file mode 100644
index 0000000..4d0d14e
--- /dev/null
+++ b/modules-3.2.9c.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:142cfbf71e33ac8a4506d71dd650d1b613999538b5b0bcb7f24167e3600e6502
+size 359384
diff --git a/return.patch b/return.patch
new file mode 100644
index 0000000..2fc348b
--- /dev/null
+++ b/return.patch
@@ -0,0 +1,10 @@
+--- a/ModuleCmd_Avail.c.old	2012-08-29 01:06:16.176859774 +0100
++++ b/ModuleCmd_Avail.c	2012-08-29 01:06:52.540527924 +0100
+@@ -680,6 +680,7 @@ static	int	check_cache( char *dir)
+ 
+ static int	test_version_dir(	struct dirent	*dp)
+ {
++    return 0;
+ }
+ /*++++
+  ** ** Function-Header ***************************************************** **
diff --git a/share.patch b/share.patch
new file mode 100644
index 0000000..86ea989
--- /dev/null
+++ b/share.patch
@@ -0,0 +1,441 @@
+diff -wruN -x '*~' ../orig-modules-3.2.9/configure ./configure
+--- ../orig-modules-3.2.9/configure	2011-11-29 16:49:37.000000000 +0100
++++ ./configure	2012-09-10 10:12:14.088801974 +0200
+@@ -1484,9 +1484,9 @@
+                           (tclExtend.h,...) [[none]]
+   --with-module-path=<path>
+                           use module path=<path>
+-                          [[PREFIX/Modules/modulefiles]]
++                          [[PREFIX/share/Modules/modulefiles]]
+   --with-version-path=<path>
+-                          use version path=<path> [[PREFIX/Modules/versions]]
++                          use version path=<path> [[PREFIX/share/Modules/versions]]
+   --with-tmp-dir=<dir>    use <dir> as a temporary dir [[/tmp]]
+   --with-man-path=<dir>   use <dir> for the default MANPATH
+                           [[/usr/man:/usr/share/man]]
+@@ -1503,19 +1503,19 @@
+ 
+ Depending on the above configuration options  the files are approximately
+ placed in the following directory structure :
+-PREFIX/Modules/($MODULES_VERSION/ if modules-versioning)
++PREFIX/share/Modules/($MODULES_VERSION/ if modules-versioning)
+ 	bin/
+ 	init/
+ 	man/
+ 		man1/
+ 		man4/
+ 	modulefiles/
+-PREFIX/Modules/
++PREFIX/share/Modules/
+ 	modulefiles/
+ 	(versions/ if modules-versioning)
+ 
+ System modulefiles can safely be placed in:
+-PREFIX/Modules/modulefiles
++PREFIX/share/Modules/modulefiles
+ 
+ 
+ Some influential environment variables:
+@@ -2905,31 +2905,31 @@
+ fi
+ if test "$prefix" != "NONE" ; then
+   if test "$WANTS_VERSIONING" -eq 1 ; then
+-    DEFAULTPATH=$prefix/Modules/default
+-    NODEFAULTPATH=$prefix/Modules/$VERSION
++    DEFAULTPATH=$prefix/share/Modules/default
++    NODEFAULTPATH=$prefix/share/Modules/$VERSION
+     BASEPREFIX=$prefix
+-    prefix=$BASEPREFIX/Modules/$VERSION
++    prefix=$BASEPREFIX/share/Modules/$VERSION
+     export prefix
+   else
+-    DEFAULTPATH=$prefix/Modules
+-    NODEFAULTPATH=$prefix/Modules
++    DEFAULTPATH=$prefix/share/Modules
++    NODEFAULTPATH=$prefix/share/Modules
+     BASEPREFIX=$prefix
+-    prefix=$BASEPREFIX/Modules
++    prefix=$BASEPREFIX/share/Modules
+     export prefix
+   fi
+   PREFIX=$prefix
+ else
+   if test "$WANTS_VERSIONING" -eq 1 ; then
+-    DEFAULTPATH=$ac_default_prefix/Modules/default
+-    NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
++    DEFAULTPATH=$ac_default_prefix/share/Modules/default
++    NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
+     BASEPREFIX=$ac_default_prefix
+-    ac_default_prefix=$BASEPREFIX/Modules/$VERSION
++    ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
+     export ac_default_prefix
+   else
+-    DEFAULTPATH=$ac_default_prefix/Modules
+-    NODEFAULTPATH=$ac_default_prefix/Modules
++    DEFAULTPATH=$ac_default_prefix/share/Modules
++    NODEFAULTPATH=$ac_default_prefix/share/Modules
+     BASEPREFIX=$ac_default_prefix
+-    ac_default_prefix=$BASEPREFIX/Modules
++    ac_default_prefix=$BASEPREFIX/share/Modules
+     export ac_default_prefix
+   fi
+   PREFIX=$ac_default_prefix
+@@ -7462,7 +7462,7 @@
+ _ACEOF
+ 
+ else
+-  	withval="$BASEPREFIX/Modules/modulefiles"
++  	withval="$BASEPREFIX/share/Modules/modulefiles"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&5
+ $as_echo "$as_me: WARNING: will use MODULEPATH=$withval : rerun configure using --with-module-path to override default" >&2;}
+ 	MODULEPATH="$withval"
+@@ -7484,7 +7484,7 @@
+ 
+ else
+   if test "$WANTS_VERSIONING" -eq 1 ; then
+-	withval="$BASEPREFIX/Modules/versions"
++	withval="$BASEPREFIX/share/Modules/versions"
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&5
+ $as_echo "$as_me: WARNING: will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default" >&2;}
+ 	VERSIONPATH="$withval"
+diff -wruN -x '*~' ../orig-modules-3.2.9/configure.ac ./configure.ac
+--- ../orig-modules-3.2.9/configure.ac	2011-11-28 23:57:59.000000000 +0100
++++ ./configure.ac	2012-09-10 10:12:14.092802142 +0200
+@@ -110,31 +110,31 @@
+ fi
+ if test "$prefix" != "NONE" ; then
+   if test "$WANTS_VERSIONING" -eq 1 ; then
+-    DEFAULTPATH=$prefix/Modules/default
+-    NODEFAULTPATH=$prefix/Modules/$VERSION
++    DEFAULTPATH=$prefix/share/Modules/default
++    NODEFAULTPATH=$prefix/share/Modules/$VERSION
+     BASEPREFIX=$prefix
+-    prefix=$BASEPREFIX/Modules/$VERSION
++    prefix=$BASEPREFIX/share/Modules/$VERSION
+     export prefix
+   else
+-    DEFAULTPATH=$prefix/Modules
+-    NODEFAULTPATH=$prefix/Modules
++    DEFAULTPATH=$prefix/share/Modules
++    NODEFAULTPATH=$prefix/share/Modules
+     BASEPREFIX=$prefix
+-    prefix=$BASEPREFIX/Modules
++    prefix=$BASEPREFIX/share/Modules
+     export prefix
+   fi
+   PREFIX=$prefix
+ else
+   if test "$WANTS_VERSIONING" -eq 1 ; then
+-    DEFAULTPATH=$ac_default_prefix/Modules/default
+-    NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
++    DEFAULTPATH=$ac_default_prefix/share/Modules/default
++    NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
+     BASEPREFIX=$ac_default_prefix
+-    ac_default_prefix=$BASEPREFIX/Modules/$VERSION
++    ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
+     export ac_default_prefix
+   else
+-    DEFAULTPATH=$ac_default_prefix/Modules
+-    NODEFAULTPATH=$ac_default_prefix/Modules
++    DEFAULTPATH=$ac_default_prefix/share/Modules
++    NODEFAULTPATH=$ac_default_prefix/share/Modules
+     BASEPREFIX=$ac_default_prefix
+-    ac_default_prefix=$BASEPREFIX/Modules
++    ac_default_prefix=$BASEPREFIX/share/Modules
+     export ac_default_prefix
+   fi
+   PREFIX=$ac_default_prefix
+@@ -815,13 +815,13 @@
+ AH_TEMPLATE([MODULEPATH],[
+ MODULEPATH: Directory that contains all the system module files])dnl
+ AC_ARG_WITH(module-path,
+-	AC_HELP_STRING([--with-module-path=<path>],[use module path=<path> [[PREFIX/Modules/modulefiles]]]),
++	AC_HELP_STRING([--with-module-path=<path>],[use module path=<path> [[PREFIX/share/Modules/modulefiles]]]),
+ 	MODULEPATH="$withval"
+ 	AC_MSG_RESULT([MODULEPATH = $with_module_path])
+ 	AC_DEFINE_UNQUOTED(MODULEPATH, "$withval")dnl
+ 	,
+ dnl 	AC_MSG_WARN([if using '--with-module-path': need to specify a path!])
+-	withval="$BASEPREFIX/Modules/modulefiles"
++	withval="$BASEPREFIX/share/Modules/modulefiles"
+ 	AC_MSG_WARN([will use MODULEPATH=$withval : rerun configure using --with-module-path to override default])
+ 	MODULEPATH="$withval"
+ 	AC_DEFINE_UNQUOTED(MODULEPATH, "$withval"))dnl
+@@ -832,14 +832,14 @@
+ AH_TEMPLATE([VERSIONPATH],[
+ VERSIONPATH: Directory that contains the env.modules version files.])dnl
+ AC_ARG_WITH(version-path,
+-	AC_HELP_STRING([--with-version-path=<path>],[use version path=<path> [[PREFIX/Modules/versions]]]),
++	AC_HELP_STRING([--with-version-path=<path>],[use version path=<path> [[PREFIX/share/Modules/versions]]]),
+ 	VERSIONPATH="$withval"
+ 	AC_MSG_RESULT([VERSIONPATH = $with_version_path])
+ 	AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval")
+ 	,
+ if test "$WANTS_VERSIONING" -eq 1 ; then
+ dnl AC_MSG_WARN([if using '--with-version-path': need to specify a path!])
+-	withval="$BASEPREFIX/Modules/versions"
++	withval="$BASEPREFIX/share/Modules/versions"
+ 	AC_MSG_WARN([will use VERSIONPATH=$withval : rerun configure using --with-version-path to override default])
+ 	VERSIONPATH="$withval"
+ 	AC_DEFINE_UNQUOTED(VERSIONPATH, "$withval")
+@@ -960,19 +960,19 @@
+ 
+ Depending on the above configuration options  the files are approximately
+ placed in the following directory structure :
+-PREFIX/Modules/($MODULES_VERSION/ if modules-versioning)
++PREFIX/share/Modules/($MODULES_VERSION/ if modules-versioning)
+ 	bin/
+ 	init/
+ 	man/
+ 		man1/
+ 		man4/
+ 	modulefiles/
+-PREFIX/Modules/
++PREFIX/share/Modules/
+ 	modulefiles/
+ 	(versions/ if modules-versioning)
+ 
+ System modulefiles can safely be placed in:
+-PREFIX/Modules/modulefiles
++PREFIX/share/Modules/modulefiles
+ ]])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl Now put it all out!
+diff -wruN -x '*~' ../orig-modules-3.2.9/etc/add.modules.in ./etc/add.modules.in
+--- ../orig-modules-3.2.9/etc/add.modules.in	2010-11-11 19:23:18.000000000 +0100
++++ ./etc/add.modules.in	2012-09-10 10:19:36.291421512 +0200
+@@ -144,7 +144,7 @@
+        -zsh|zsh|*/zsh)	modules_shell=zsh ;;
+     -bash|bash|*/bash)	modules_shell=bash ;;
+ esac
+-@VERSIONING@module() { eval \`@BASEPREFIX@/Modules/\$MODULE_VERSION/bin/modulecmd \$modules_shell \$*\`; }
++@VERSIONING@module() { eval \`@BASEPREFIX@/share/Modules/\$MODULE_VERSION/bin/modulecmd \$modules_shell \$*\`; }
+ @NOTVERSIONING@module() { eval \`@bindir@/modulecmd \$modules_shell \$*\`; }
+ !
+ 				elif [ x$3 = xcsh ]
+diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/bashrc.in ./etc/global/bashrc.in
+--- ../orig-modules-3.2.9/etc/global/bashrc.in	2010-11-11 19:23:18.000000000 +0100
++++ ./etc/global/bashrc.in	2012-09-10 10:20:00.468439340 +0200
+@@ -11,7 +11,7 @@
+        -zsh|zsh|*/zsh)	modules_shell=zsh ;;
+     -bash|bash|*/bash)	modules_shell=bash ;;
+ esac
+-@VERSIONING@eval "module() { eval \`@BASEPREFIX@/Modules\$MODULE_VERSION/bin/modulecmd $modules_shell \$*\`; }"
++@VERSIONING@eval "module() { eval \`@BASEPREFIX@/share/Modules\$MODULE_VERSION/bin/modulecmd $modules_shell \$*\`; }"
+ @NOTVERSIONING@eval "module() { eval \`@bindir@/modulecmd $modules_shell \$*\`; }"
+ 
+ unset modules_shell
+diff -wruN -x '*~' ../orig-modules-3.2.9/etc/global/csh.cshrc.in ./etc/global/csh.cshrc.in
+--- ../orig-modules-3.2.9/etc/global/csh.cshrc.in	2002-06-14 08:15:20.000000000 +0200
++++ ./etc/global/csh.cshrc.in	2012-09-10 10:20:08.220765705 +0200
+@@ -10,7 +10,7 @@
+ 	set modules_shell="csh"
+ endif
+ 
+-@VERSIONING@alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
++@VERSIONING@alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+ @NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
+ 
+ unset modules_shell
+diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.cshrc.in ./etc/skel/.cshrc.in
+--- ../orig-modules-3.2.9/etc/skel/.cshrc.in	2002-06-14 08:15:21.000000000 +0200
++++ ./etc/skel/.cshrc.in	2012-09-10 10:21:44.688826752 +0200
+@@ -4,7 +4,7 @@
+ else
+         set modules_shell="csh"
+ endif
+-@VERSIONING@alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
++@VERSIONING@alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+ @NOTVERSIONING@alias module 'eval `@bindir@/modulecmd '$modules_shell '\!*`'
+ 
+ if (! $?prompt) exit			#exit if not interactive
+diff -wruN -x '*~' ../orig-modules-3.2.9/etc/skel/.kshenv.in ./etc/skel/.kshenv.in
+--- ../orig-modules-3.2.9/etc/skel/.kshenv.in	2002-06-14 08:15:21.000000000 +0200
++++ ./etc/skel/.kshenv.in	2012-09-10 10:21:52.657162178 +0200
+@@ -4,7 +4,7 @@
+        -ksh|ksh|*/ksh)	modules_shell=ksh ;;
+     -bash|bash|*/bash)	modules_shell=bash ;;
+ esac
+-@VERSIONING@eval "module() { eval `@BASEPREFIX@/Modules/\$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }"
++@VERSIONING@eval "module() { eval `@BASEPREFIX@/share/Modules/\$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }"
+ @NOTVERSIONING@eval "module() { eval `@bindir@/modulecmd $modules_shell $*`; }"
+ 
+ unset modules_shell
+diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.cshrc.in ./ext/common/.cshrc.in
+--- ../orig-modules-3.2.9/ext/common/.cshrc.in	2002-06-14 08:15:21.000000000 +0200
++++ ./ext/common/.cshrc.in	2012-09-10 10:21:06.015198726 +0200
+@@ -4,7 +4,7 @@
+ else
+         set modules_shell="csh"
+ endif
+-alias module 'eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
++alias module 'eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd '$modules_shell '\!*`'
+ 
+ if ( -f $HOME/.cshrc.ext ) then 
+ 	source $HOME/.cshrc.ext
+diff -wruN -x '*~' ../orig-modules-3.2.9/ext/common/.kshenv.in ./ext/common/.kshenv.in
+--- ../orig-modules-3.2.9/ext/common/.kshenv.in	2002-06-14 08:15:21.000000000 +0200
++++ ./ext/common/.kshenv.in	2012-09-10 10:21:12.871487357 +0200
+@@ -4,7 +4,7 @@
+        -ksh|ksh|*/ksh)	modules_shell=ksh ;;
+     -bash|bash|*/bash)	modules_shell=bash ;;
+ esac
+-module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }
++module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd $modules_shell $*`; }
+ 
+ if [ -f ${ENV:-$HOME/.kshenv.ext} ]; then
+ 	. ${ENV:-$HOME/.kshenv.ext}
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash_completion.in ./init/bash_completion.in
+--- ../orig-modules-3.2.9/init/bash_completion.in	2010-07-27 21:09:06.000000000 +0200
++++ ./init/bash_completion.in	2012-09-10 10:22:45.543388781 +0200
+@@ -2,7 +2,7 @@
+ # Bash commandline completion (bash 3.0 and above) for Modules @VERSION@
+ #
+ _module_avail() {
+-@VERSIONING@	@BASEPREFIX@/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
++@VERSIONING@	@BASEPREFIX@/share/Modules/@VERSION@/bin/modulecmd bash -t avail 2>&1 | sed '
+ @NOTVERSIONING@	@bindir@/modulecmd bash -t avail 2>&1 | sed '
+ 		/:$/d;
+ 		/:ERROR:/d;
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/bash.in ./init/bash.in
+--- ../orig-modules-3.2.9/init/bash.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/bash.in	2012-09-10 10:24:04.194703624 +0200
+@@ -7,7 +7,7 @@
+ @VERSIONING@fi
+ @VERSIONING@export MODULE_VERSION_STACK
+ 
+-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd bash $*`; }
++@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd bash $*`; }
+ @NOTVERSIONING@module() { eval `@bindir@/modulecmd bash $*`; }
+ export -f module
+ 
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/cmake.in ./init/cmake.in
+--- ../orig-modules-3.2.9/init/cmake.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/cmake.in	2012-09-10 10:22:52.063663594 +0200
+@@ -6,7 +6,7 @@
+ @VERSIONING@endif()
+ 
+ function(module ARGS)
+-@VERSIONING@  set(exec_prefix "@BASEPREFIX@/Modules/$ENV{MODULE_VERSION}/bin")
++@VERSIONING@  set(exec_prefix "@BASEPREFIX@/share/Modules/$ENV{MODULE_VERSION}/bin")
+ 
+ @NOTVERSIONING@  set(exec_prefix "@bindir@")
+ 
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/csh.in ./init/csh.in
+--- ../orig-modules-3.2.9/init/csh.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/csh.in	2012-09-10 10:23:09.980418728 +0200
+@@ -9,7 +9,7 @@
+ @VERSIONING@ 	setenv MODULE_VERSION		"@VERSION@"
+ @VERSIONING@ 	setenv MODULE_VERSION_STACK	"@VERSION@"
+ @VERSIONING@endif
+-@VERSIONING@set exec_prefix='@BASEPREFIX@/Modules/$MODULE_VERSION'
++@VERSIONING@set exec_prefix='@BASEPREFIX@/share/Modules/$MODULE_VERSION'
+ @NOTVERSIONING@set exec_prefix='@bindir@'
+ 
+ set prefix=""
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/ksh.in ./init/ksh.in
+--- ../orig-modules-3.2.9/init/ksh.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/ksh.in	2012-09-10 10:23:19.488819479 +0200
+@@ -7,7 +7,7 @@
+ @VERSIONING@fi
+ @VERSIONING@export MODULE_VERSION_STACK
+ 
+-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd ksh $*`; }
++@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd ksh $*`; }
+ @NOTVERSIONING@module() { eval `@bindir@/modulecmd ksh $*`; }
+ 
+ MODULESHOME=@prefix@
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/.modulespath.in ./init/.modulespath.in
+--- ../orig-modules-3.2.9/init/.modulespath.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/.modulespath.in	2012-09-10 10:28:34.310087174 +0200
+@@ -14,7 +14,7 @@
+ #     limited by the maximum variable size of your shell.
+ #
+ @VERSIONING@@VERSIONPATH@				# location of version files
+-@VERSIONING@@BASEPREFIX@/Modules/$MODULE_VERSION/modulefiles	# Module pkg modulefiles (if versioning)
+-@NOTVERSIONING@@BASEPREFIX@/Modules/modulefiles	# Module pkg modulefiles (if no versioning)
++@VERSIONING@@BASEPREFIX@/share/Modules/$MODULE_VERSION/modulefiles	# Module pkg modulefiles (if versioning)
++@NOTVERSIONING@@BASEPREFIX@/share/Modules/modulefiles	# Module pkg modulefiles (if no versioning)
+ @MODULEPATH@				# General module files
+ #@prefix@/your_contribs			# Edit for your requirements
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/perl.pm.in ./init/perl.pm.in
+--- ../orig-modules-3.2.9/init/perl.pm.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/perl.pm.in	2012-09-10 10:23:23.744998856 +0200
+@@ -7,7 +7,7 @@
+ 
+ sub module {
+ 	local ($exec_prefix);
+-@VERSIONING@	$exec_prefix = "@BASEPREFIX@/Modules/".$ENV{"MODULE_VERSION"};
++@VERSIONING@	$exec_prefix = "@BASEPREFIX@/share/Modules/".$ENV{"MODULE_VERSION"};
+ @VERSIONING@	eval `$exec_prefix/bin/modulecmd perl @_`;
+ 
+ @NOTVERSIONING@	$exec_prefix = "@bindir@";
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/python.py.in ./init/python.py.in
+--- ../orig-modules-3.2.9/init/python.py.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/python.py.in	2012-09-10 10:23:32.481367054 +0200
+@@ -24,7 +24,7 @@
+ 		args = args[0]
+ 	else:
+ 		args = list(args)
+-@VERSIONING@	(output, error) = subprocess.Popen(['@BASEPREFIX@/Modules/%s/bin/modulecmd' % os.environ['MODULE_VERSION'], 'python'] + 
++@VERSIONING@	(output, error) = subprocess.Popen(['@BASEPREFIX@/share/Modules/%s/bin/modulecmd' % os.environ['MODULE_VERSION'], 'python'] + 
+ @NOTVERSIONING@	(output, error) = subprocess.Popen(['@bindir@/modulecmd', 'python'] + 
+ 			args, stdout=subprocess.PIPE).communicate()
+ 	exec output
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/ruby.rb.in ./init/ruby.rb.in
+--- ../orig-modules-3.2.9/init/ruby.rb.in	2011-10-17 18:45:40.000000000 +0200
++++ ./init/ruby.rb.in	2012-09-10 10:23:37.937597014 +0200
+@@ -22,7 +22,7 @@
+     else
+       args = args.join(" ")
+     end
+-@VERSIONING@    exec_prefix = "@BASEPREFIX@/Modules/#{ENV['MODULE_VERSION']}"
++@VERSIONING@    exec_prefix = "@BASEPREFIX@/share/Modules/#{ENV['MODULE_VERSION']}"
+ @VERSIONING@    eval  `#{exec_prefix}/bin/modulecmd ruby #{args}`
+ 
+ @NOTVERSIONING@    exec_prefix = "@bindir@"
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/sh.in ./init/sh.in
+--- ../orig-modules-3.2.9/init/sh.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/sh.in	2012-09-10 10:23:45.521916658 +0200
+@@ -7,7 +7,7 @@
+ @VERSIONING@fi
+ @VERSIONING@export MODULE_VERSION_STACK
+ 
+-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd sh $*`; }
++@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd sh $*`; }
+ @NOTVERSIONING@module() { eval `@bindir@/modulecmd sh $*`; }
+ 
+ MODULESHOME=@prefix@
+diff -wruN -x '*~' ../orig-modules-3.2.9/init/zsh.in ./init/zsh.in
+--- ../orig-modules-3.2.9/init/zsh.in	2010-11-11 19:23:18.000000000 +0100
++++ ./init/zsh.in	2012-09-10 10:23:53.082235275 +0200
+@@ -7,7 +7,7 @@
+ @VERSIONING@fi
+ @VERSIONING@export MODULE_VERSION_STACK
+ 
+-@VERSIONING@module() { eval `@BASEPREFIX@/Modules/$MODULE_VERSION/bin/modulecmd zsh $*`; }
++@VERSIONING@module() { eval `@BASEPREFIX@/share/Modules/$MODULE_VERSION/bin/modulecmd zsh $*`; }
+ @NOTVERSIONING@module() { eval `@bindir@/modulecmd zsh $*`; }
+ 
+ MODULESHOME=@prefix@
+diff -wruN -x '*~' ../orig-modules-3.2.9/INSTALL ./INSTALL
+--- ../orig-modules-3.2.9/INSTALL	2006-01-12 20:14:24.000000000 +0100
++++ ./INSTALL	2012-09-10 10:12:14.056800627 +0200
+@@ -103,7 +103,7 @@
+ your system root, else it may get wiped out with every OS upgrade.
+ The default is /usr/local/Modules/modulefiles/. You will use the
+ --with-module-path=<path> option to the configure script to set this
+-directory.  The default is $prefix/Modules/modulefiles, where
++directory.  The default is $prefix/share/Modules/modulefiles, where
+ $prefix is set by the the --prefix configure option.  (The default
+ is /usr/local.)
+ After the initial hardwork of getting the module command
+@@ -152,7 +152,7 @@
+              --prefix=/alternate/usr/local/or/equivalent/1.0/eg
+ 
+ The default for --prefix is /usr/local ($prefix).
+-The default for --with-module-path is "$prefix/Modules/modulefiles".
++The default for --with-module-path is "$prefix/share/Modules/modulefiles".
+ 
+ If you have trouble with the configuration, then consider
+ Run "./configure --help" to view some of the other options.