diff --git a/maven-scm-plugin/pom.xml b/maven-scm-plugin/pom.xml
index e378282..be5f101 100644
--- a/maven-scm-plugin/pom.xml
+++ b/maven-scm-plugin/pom.xml
@@ -126,6 +126,7 @@
     </extensions>
     <pluginManagement>
       <plugins>
+        <!-- TODO: remove when maven-plugins parent pom 12 is released -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
@@ -142,10 +143,24 @@
             <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/scm/maven-scm-plugin-${project.version}</stagingSiteURL>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
-  
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <profiles>
     <profile>
       <id>reporting</id>
@@ -173,7 +188,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-plugin-plugin</artifactId>
-            <version>2.4.2</version>
+            <version>2.4.3</version>
           </plugin>
           <!-- TODO: remove when maven-plugins parent pom 12 is released -->
           <plugin>
@@ -345,11 +360,6 @@
               </taglets>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-plugin-plugin</artifactId>
-            <version>2.4.2</version>
-          </plugin>
         </plugins>
       </reporting>
     </profile>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
index d098002..2c6be09 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/mdo/svn-settings.mdo
@@ -40,6 +40,15 @@
              The cygwin mount path. The default value is '/cygwin'.
           ]]></description>
         </field>
+        <field>
+          <name>useNonInteractive</name>
+          <version>1.1.0+</version>
+          <type>boolean</type>
+          <defaultValue>true</defaultValue>
+          <description><![CDATA[
+             Switch off if you do not like to use --non-interactive e.g. on Leopard (see SCM-402).
+          ]]></description>
+        </field>
       </fields>
     </class>
   </classes>
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
index b54ae65..17286c3 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/SvnCommandLineUtils.java
@@ -115,7 +115,9 @@
             cl.createArgument().setValue( repository.getPassword() );
         }
 
-        cl.createArgument().setValue( "--non-interactive" );
+        if ( SvnUtil.getSettings().isUseNonInteractive() ) {
+            cl.createArgument().setValue( "--non-interactive" );
+        }
 
         return cl;
     }
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
index 32f58bb..69519c8 100644
--- a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommandTest.java
@@ -22,6 +22,7 @@
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.provider.svn.util.SvnUtil;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -78,6 +79,22 @@
         testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk",
                          "svn --username anonymous --non-interactive commit " + messageFileString );
     }
+    
+    public void testCommandLineWithUsernameWithoutNonInteractive()
+        throws Exception
+    {
+        try
+        {
+            SvnUtil.setSettingsDirectory( getTestFile( "src/test/resources/svn/checkin/macos" ) );
+            testCommandLine( "scm:svn:http://anonymous@foo.com/svn/trunk", "svn --username anonymous commit "
+                + messageFileString );
+        }
+        finally
+        {
+
+            SvnUtil.setSettingsDirectory( SvnUtil.DEFAULT_SETTINGS_DIRECTORY );
+        }
+    }
 
     // ----------------------------------------------------------------------
     //
diff --git a/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
new file mode 100644
index 0000000..14e9c30
--- /dev/null
+++ b/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/test/resources/svn/checkin/macos/svn-settings.xml
@@ -0,0 +1,3 @@
+<svn-settings>
+  <useNonInteractive>false</useNonInteractive>
+</svn-settings>
diff --git a/pom.xml b/pom.xml
index 80fb6b0..a913793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -323,7 +323,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.4.2</version>
+          <version>2.4.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -403,8 +403,8 @@
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.1</version>
+            <artifactId>maven-plugin-plugin</artifactId>
+            <version>2.4.3</version>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/site/apt/subversion.apt b/src/site/apt/subversion.apt
index 19cd470..c227f7e 100644
--- a/src/site/apt/subversion.apt
+++ b/src/site/apt/subversion.apt
@@ -70,6 +70,7 @@
   <configDirectory>your_configuration_directory</configDirectory>
   <useCygwinPath>true in order to use cygwin path /cygdrive/c</useCygwinPath>
   <cygwinMountPath>the mount path to use default is /cygwin</cygwinMountPath>
+  <useNonInteractive> if false --non-interactive will not be used in the svn command line</useNonInteractive>
 </svn-settings>
 -------
 
diff --git a/src/site/site.xml b/src/site/site.xml
index f87cbeb..e4255e8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -61,6 +61,7 @@
 
     <menu name="Quick Links">
       <item name="Home" href="/index.html"/>
+      <item name="Maven SCM Plugin" href="/maven-scm-plugin/index.html"/>
       <item name="Javadoc" href="/apidocs/index.html"/>
       <item name="SCM URL Format" href="/scm-url-format.html"/>
       <item name="Supported SCMs" href="/scms-overview.html" collapse="true">