diff --git a/.classpath b/.classpath
index 3db29c3e..728ca1d9 100644
--- a/.classpath
+++ b/.classpath
@@ -11,6 +11,6 @@
 	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.core_3.3.200.v20090528-1135.jar"/>
 	<classpathentry kind="lib" path="deps/org.eclipse.jdt.apt.pluggable.core_1.0.200.v20090526-2130.jar"/>
 	<classpathentry kind="lib" path="deps/org.eclipse.jdt.compiler.apt_1.0.200.v20090528-1135.jar"/>
-	<classpathentry kind="lib" path="deps/org.eclipse.jdt.core_3.5.0.v_963.jar"/>
+	<classpathentry kind="lib" path="deps/org.eclipse.jdt.core_3.5.0.v_963.jar" sourcepath="/Users/rzwitserloot/newworkspace/org.eclipse.jdt.core/compiler"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build.xml b/build.xml
index f2d1b635..2812017d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,11 +1,16 @@
 <project name="lombok" default="dist">
+	<loadresource property="lombok.version">
+		<file file="version.txt" />
+	</loadresource>
 	<property name="build.compiler" value="javac1.6" />
-	<path id="deps.path">
+	<path id="lombok.deps.path">
 		<fileset dir="deps">
 			<include name="**/*.jar" />
 		</fileset>
 	</path>
-	<path id="libs.path">
+	<path id="lombok.libs.path" />
+	<path id="eclipse.agent.deps.path" />
+	<path id="eclipse.agent.libs.path">
 		<fileset dir="lib">
 			<include name="**/*.jar" />
 		</fileset>
@@ -17,33 +22,41 @@
 	</target>
 	
 	<target name="compile">
-		<mkdir dir="build" />
-		<javac srcdir="src" debug="on" destdir="build">
-			<classpath refid="deps.path" />
-			<classpath refid="libs.path" />
+		<mkdir dir="build/lombok" />
+		<javac srcdir="src" debug="on" destdir="build/lombok">
+			<classpath refid="lombok.deps.path" />
+			<classpath refid="lombok.libs.path" />
+		</javac>
+		<mkdir dir="build/lombok/META-INF" />
+		<mkdir dir="build/lombok/META-INF/services" />
+		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.apt.Processor</echo>
+		
+		<mkdir dir="build/eclipse.agent" />
+		<javac srcdir="src_eclipseagent" debug="on" destdir="build/eclipse.agent">
+			<classpath refid="eclipse.agent.deps.path" />
+			<classpath refid="eclipse.agent.libs.path" />
 		</javac>
-		<mkdir dir="build/META-INF" />
-		<mkdir dir="build/META-INF/services" />
-		<echo file="build/META-INF/services/javax.annotation.processing.Processor">lombok.apt.Processor</echo>
 	</target>
 	
 	<target name="unpackLibs">
-		<unjar dest="build">
-			<path refid="libs.path" />
+		<unjar dest="build/lombok">
+			<path refid="lombok.libs.path" />
+		</unjar>
+		<unjar dest="build/eclipse.agent">
+			<path refid="eclipse.agent.libs.path" />
 		</unjar>
 	</target>
 	
 	<target name="dist" depends="clean, compile, unpackLibs">
 		<mkdir dir="dist" />
-		<tstamp>
-			<format property="distTime" pattern="yyyyMMdd'T'hhmmss" locale="en,US" />
-		</tstamp>
-		<jar basedir="build" destfile="dist/lombok-${distTime}.jar">
+		<jar basedir="build/lombok" destfile="dist/lombok-${lombok.version}.jar" />
+		<jar basedir="build/eclipse.agent" destfile="dist/lombok.eclipse.agent-${lombok.version}.jar">
 			<manifest>
 				<attribute name="Premain-Class" value="lombok.agent.eclipse.EclipseParserPatcher" />
 				<attribute name="Can-Redefine-Classes" value="true" />
 			</manifest>
 		</jar>
-		<copy file="dist/lombok-${distTime}.jar" tofile="dist/lombok.jar" />
+		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
+		<copy file="dist/lombok.eclipse.agent-${lombok.version}.jar" tofile="dist/lombok.eclipse.agent.jar" />
 	</target>
 </project>
diff --git a/version.txt b/version.txt
new file mode 100644
index 00000000..6c6aa7cb
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+0.1.0
\ No newline at end of file