diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 5c2e06cce7..bf61481e2d 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -30,6 +30,10 @@
   <name>Maven Distribution</name>
   <description>Module to build the Maven distribution, source and binary, in zip and tar.gz formats.</description>
 
+  <properties>
+    <distributionName>apache-maven</distributionName>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -67,6 +71,7 @@
   </dependencies>
 
   <build>
+    <finalName>${distributionId}-${project.version}</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/build.xml b/build.xml
index 2f516b81d0..75e3d35ff8 100644
--- a/build.xml
+++ b/build.xml
@@ -31,9 +31,12 @@ END SNIPPET: ant-bootstrap -->
 
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
+  <property name="distributionDirectory" value="apache-maven"/>
+  <property name="distributionName" value="apache-maven"/>
   <property name="it.workdir.version" value="3.0.x" />
 
   <target name="initTaskDefs">
+    <echo>Building ${distributionName} ...</echo>
     <xmlproperty file="pom.xml" prefix="xmlPom" />
     <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
@@ -72,8 +75,8 @@ Do you want to continue?</input>
 
   <target name="init" depends="isMavenHomeSet">
     <!-- Initialize properties -->
-    <property name="maven.home.basename.expected" value="apache-maven-${xmlPom.project.version}" />
-    <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip" />
+    <property name="maven.home.basename.expected" value="${distributionName}-${xmlPom.project.version}" />
+    <property name="maven.assembly" location="${distributionDirectory}/target/${maven.home.basename.expected}-bin.zip" />
     <property name="maven.repo.local" value="${user.home}/.m2/repository" />
     <property name="maven.debug" value="-e" />
     <property name="maven.test.skip" value="false" />
@@ -83,6 +86,9 @@ Do you want to continue?</input>
     <property name="maven.goal" value="install" />
     <echo>maven.home = ${maven.home}</echo>
     <echo>maven.repo.local = ${maven.repo.local}</echo>
+    <echo>distributionId = ${distributionId}</echo>
+    <echo>distributionName = ${distributionName}</echo>
+    <echo>distributionDirectory = ${distributionDirectory}</echo>
   </target>
 
   <target name="clean-bootstrap" description="cleans up generated bootstrap classes">
@@ -252,6 +258,7 @@ Do you want to continue?</input>
       <arg value="-Dmaven.repo.local=${maven.repo.local}" />
       <arg value="-Dsurefire.useFile=${surefire.useFile}" />
       <arg value="-Dmaven.test.redirectTestOutputToFile=${maven.test.redirectTestOutputToFile}" />
+      <arg value="-DdistributionName=${distributionName}" />
     </java>
   </target>
 
diff --git a/maven-core/src/main/resources/org/apache/maven/messages/build.properties b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
index a5fd160b61..ab2e60f8d8 100644
--- a/maven-core/src/main/resources/org/apache/maven/messages/build.properties
+++ b/maven-core/src/main/resources/org/apache/maven/messages/build.properties
@@ -1,3 +1,6 @@
 buildNumber=${buildNumber}
 timestamp=${timestamp}
 version=${project.version}
+distributionId=${distributionId}
+distributionShortName=${distributionShortName}
+distributionName=${distributionName}
\ No newline at end of file
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 06227a18ce..bca4883b42 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -54,8 +54,9 @@ public final class CLIReportingUtils
     {
         Properties properties = getBuildProperties();
         stdout.println( createMavenVersionString( properties ) );
+        String shortName = reduce( properties.getProperty( "distributionShortName" ) );
 
-        stdout.println( "Maven home: " + System.getProperty( "maven.home", "<unknown maven home>" ) );
+        stdout.println( shortName + " home: " + System.getProperty( "maven.home", "<unknown maven home>" ) );
 
         stdout.println( "Java version: " + System.getProperty( "java.version", "<unknown java version>" )
             + ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) );
@@ -80,8 +81,9 @@ public final class CLIReportingUtils
         String timestamp = reduce( buildProperties.getProperty( "timestamp" ) );
         String version = reduce( buildProperties.getProperty( BUILD_VERSION_PROPERTY ) );
         String rev = reduce( buildProperties.getProperty( "buildNumber" ) );
+        String distributionName = reduce( buildProperties.getProperty( "distributionName" ) );
 
-        String msg = "Apache Maven ";
+        String msg = distributionName + " ";
         msg += ( version != null ? version : "<version unknown>" );
         if ( rev != null || timestamp != null )
         {
diff --git a/pom.xml b/pom.xml
index 7e690a41a7..cca79df853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,10 @@
     <jxpathVersion>1.3</jxpathVersion>
     <aetherVersion>1.11</aetherVersion>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
+    <!-- Control the name of the distribtion and information output by mvn -->
+    <distributionId>apache-maven</distributionId>
+    <distributionShortName>Maven</distributionShortName>
+    <distributionName>Apache Maven</distributionName>
   </properties>
 
   <mailingLists>