diff --git a/build.xml b/build.xml
index d747e617..676c34d7 100644
--- a/build.xml
+++ b/build.xml
@@ -164,12 +164,15 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile">
 		<mkdir dir="dist" />
 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
-		<jar destfile="dist/lombok-${lombok.version}.jar">
+		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/jarjar.jar" />
+		<jarjar destfile="dist/lombok-${lombok.version}.jar">
 			<fileset dir="build/lombok">
 				<exclude name="com/sun/**"/>
 			</fileset>
 			<fileset dir="build" includes="changelog.txt" />
 			<fileset dir="." includes="LICENSE" />
+			<rule pattern="com.zwitserloot.cmdreader.**" result="lombok.libs.com.zwitserloot.cmdreader.@1" />
+			<rule pattern="org.objectweb.asm.**" result="lombok.libs.org.objectweb.asm.@1" />
 			<manifest>
 				<attribute name="Premain-Class" value="lombok.core.Agent" />
 				<attribute name="Agent-Class" value="lombok.core.Agent" />
@@ -177,7 +180,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 				<attribute name="Main-Class" value="lombok.core.Main" />
 				<attribute name="Lombok-Version" value="${lombok.version}" />
 			</manifest>
-		</jar>
+		</jarjar>
 		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
 		<property name="lombok.dist.built" value="true" />
 	</target>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 4d3bb679..33d62da9 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -16,6 +16,7 @@
 		<dependency org="log4j" name="log4j" rev="1.2.16" conf="test->default; contrib->sources" />
 		<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources"/>
 		<dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources"/>
+		<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="build->default" />
 		
 		<dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->default; contrib->sources" />
 		<dependency org="projectlombok.org" name="spi" rev="0.2.4" conf="build" />
diff --git a/doc/maven-pom.xml b/doc/maven-pom.xml
index 61738a72..34955ab8 100644
--- a/doc/maven-pom.xml
+++ b/doc/maven-pom.xml
@@ -18,7 +18,7 @@
 	</licenses>
 	<scm>
 		<connection>scm:git:git://github.com/rzwitserloot/lombok.git</connection>
-		<url>scm:git:git://github.com/rzwitserloot/lombok.git</url>
+		<url>http://github.com/rzwitserloot/lombok</url>
 	</scm>
 	<issueManagement>
 		<system>Google Code</system>