diff --git a/pom.xml b/pom.xml
index 4be40263a..9e14ed16c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,24 @@
 		</license>
 	</licenses>
 
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- dist.* properties are used by the antrun tasks below -->
+		<dist.id>spring-data-document</dist.id>
+		<dist.name>Spring Data Document</dist.name>
+		<dist.key>DATADOC</dist.key>
+		<dist.version>${project.version}</dist.version>
+		<dist.releaseType>snapshot</dist.releaseType>
+		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
+		<dist.fileName>${dist.finalName}.zip</dist.fileName>
+		<dist.filePath>target/${dist.fileName}</dist.filePath>
+		<dist.bucketName>dist.springframework.org</dist.bucketName>
+		<!-- these properties should be in ~/.m2/settings.xml
+		<dist.accessKey>s3 access key</dist.accessKey>
+		<dist.secretKey>s3 secret key</dist.secretKey>
+		-->
+	</properties>
+
 	<build>
 		<extensions>
 			<extension>
@@ -229,8 +247,8 @@
 				</dependencies>
 			</plugin>
 		</plugins>
-		<!-- the name of this project is 'spring-data-graph-dist';
-			 make sure the zip file is just 'spring-data-graph'. -->
+		<!-- the name of this project is 'spring-data-document-dist';
+			 make sure the zip file is just 'spring-data-document'. -->
 		<finalName>${dist.finalName}</finalName>
 	</build>
 
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index d18bb1203..1b158556d 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -17,7 +17,7 @@
 			<directory>src/main/resources</directory>
 			<includes>
 				<include>readme.txt</include>
-				<include>apache-license.txt</include>
+				<include>license.txt</include>
 				<include>notice.txt</include>
 				<include>changelog.txt</include>
 			</includes>