diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
index c823c82bbe5..518c8fabb43 100644
--- a/hapi-fhir-cli/pom.xml
+++ b/hapi-fhir-cli/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<groupId>ca.uhn.hapi.example</groupId>
+	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir-cli</artifactId>
 	<packaging>jar</packaging>
 
diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
index a5aa5e4bf54..ac642490542 100644
--- a/hapi-fhir-dist/pom.xml
+++ b/hapi-fhir-dist/pom.xml
@@ -30,6 +30,23 @@
 			<artifactId>hapi-fhir-structures-dstu2</artifactId>
 			<version>1.2</version>
 		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-validation-resources-dstu2</artifactId>
+			<version>1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-cli</artifactId>
+			<version>1.2</version>
+			<!-- Don't include in standard distribution -->
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
diff --git a/hapi-fhir-dist/src/assembly/hapi-fhir-cli.xml b/hapi-fhir-dist/src/assembly/hapi-fhir-cli.xml
new file mode 100644
index 00000000000..d98e9e22155
--- /dev/null
+++ b/hapi-fhir-dist/src/assembly/hapi-fhir-cli.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+	<id>cli</id>
+
+	<formats>
+		<format>zip</format>
+		<format>tar.bz2</format>
+	</formats>
+
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<fileSets>
+		<fileSet>
+			<directory>${project.basedir}/../hapi-fhir-cli/target/</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>hapi-fhir-cli.jar</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>${project.basedir}/../hapi-fhir-cli/src/main/script</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>hapi-fhir-cli</include>
+				<include>hapi-fhir-cli.cmd</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+
+</assembly>