diff --git a/distro/descriptor.xml b/distro/descriptor.xml
index 47a5f4a..ba2c192 100644
--- a/distro/descriptor.xml
+++ b/distro/descriptor.xml
@@ -1,5 +1,7 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 	<id>servicearchive</id>
 	<formats>
 		<format>tar.gz</format>
@@ -8,7 +10,7 @@
 	<fileSets>
 		<fileSet>
 			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
+			<outputDirectory>${file.separator}</outputDirectory>
 			<useDefaultExcludes>true</useDefaultExcludes>
 			<includes>
 				<include>README</include>
@@ -22,8 +24,8 @@
 	</fileSets>
 	<files>
 		<file>
-			<source>target/${build.finalName}.jar</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
+			<source>target${file.separator}${build.finalName}.${project.packaging}</source>
+			<outputDirectory>${file.separator}${artifactId}</outputDirectory>
 		</file>
 	</files>
 </assembly>
\ No newline at end of file