diff -urN apache-maven-2.2.1/bin/mvn apache-maven-2.2.1.new/bin/mvn
--- apache-maven-2.2.1/bin/mvn	2009-08-06 12:18:12.000000000 -0700
+++ apache-maven-2.2.1.new/bin/mvn	2010-06-06 23:43:34.000000000 -0700
@@ -45,6 +45,10 @@
   . /etc/mavenrc
 fi
 
+if [ -f @FINKPREFIX@/etc/maven/mavenrc ] ; then
+  . @FINKPREFIX@/etc/maven/mavenrc
+fi
+
 if [ -f "$HOME/.mavenrc" ] ; then
   . "$HOME/.mavenrc"
 fi
@@ -142,6 +146,8 @@
   echo "Warning: JAVA_HOME environment variable is not set."
 fi
 
+[ -z "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF="${M2_HOME}/bin/m2.conf"
+
 CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
 
 # For Cygwin, switch paths to Windows format before running java
@@ -157,7 +163,7 @@
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   -classpath "${M2_HOME}"/boot/classworlds-*.jar \
-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
+  "-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
   "-Dmaven.home=${M2_HOME}"  \
   ${CLASSWORLDS_LAUNCHER} $QUOTED_ARGS