--- /usr/bin/mvn	2011-05-11 12:38:18.317406529 +0200
+++ /usr/bin/mvn	2011-05-11 12:37:30.577126388 +0200
@@ -49,6 +49,12 @@
   . "$HOME/.mavenrc"
 fi
 
+if [ -f "./.mavenrc" ] ; then
+  . "./.mavenrc"
+fi
+
+MAVEN_OPTS="$ADDITIONAL_MAVEN_OPTS $MAVEN_OPTS"
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;