diff --git a/ldif/ldif-batch/src/test/resources/log4j.properties b/ldif/ldif-batch/src/test/resources/log4j.properties
index 2a0545bb..35e3921f 100644
--- a/ldif/ldif-batch/src/test/resources/log4j.properties
+++ b/ldif/ldif-batch/src/test/resources/log4j.properties
@@ -9,4 +9,4 @@ log4j.logger.org.springframework.context=INFO, console
 log4j.logger.org.springframework.transaction=INFO, console
 log4j.logger.org.springframework.aop=INFO, console
 log4j.logger.org.springframework.batch=INFO, console
-log4j.logger.org.springframework.ldap.ldif=DEBUG, console
\ No newline at end of file
+log4j.logger.org.springframework.ldap.ldif=INFO, console
\ No newline at end of file
diff --git a/ldif/pom.xml b/ldif/pom.xml
index 3b97f77b..50af3156 100644
--- a/ldif/pom.xml
+++ b/ldif/pom.xml
@@ -11,64 +11,8 @@
   <packaging>pom</packaging>
   <name>Spring LDAP LDIF</name>
   <description>This packages provides an LDIF Parser for use with the Spring LDAP suite of utilities.</description>
-  <build>
-  	<plugins>
-  		<plugin>
-  			<groupId>org.apache.maven.plugins</groupId>
-  			<artifactId>maven-compiler-plugin</artifactId>
-  			<configuration>
-  				<source>1.5</source>
-  				<target>1.5</target>
-  			</configuration>
-  		</plugin>
-  		<plugin>
-  			<groupId>org.apache.maven.plugins</groupId>
-  			<artifactId>maven-javadoc-plugin</artifactId>
-  			<configuration>
-  				<aggregate>true</aggregate>
-  				<show>public</show>
-  				<links>
-  					<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-  					<link>http://static.springsource.org/spring/docs/2.5.x/api/</link>
-  					<link>http://static.springsource.org/spring-ldap/docs/1.3.x/apidocs/</link>
-  					<link>http://static.springsource.org/spring-batch/apidocs/</link>
-  				</links>
-  			</configuration>
-  		</plugin>
-  	</plugins>
-  </build>
   <modules>
   	<module>ldif-core</module>
   	<module>ldif-batch</module>
   </modules>
-  <dependencies>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.ldap</groupId>
-      <artifactId>spring-ldap</artifactId>
-      <version>${version}</version>
-      <classifier>all</classifier>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 4205f636..78d272e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,10 +121,10 @@
 		<module>parent</module>
 		<module>core</module>
 		<module>core-tiger</module>
-		<module>ldif</module>
-		<module>odm</module>
 		<module>test-support</module>
 		<module>test</module>
+		<module>ldif</module>
+		<module>odm</module>
 	</modules>
 	<profiles>
 		<profile>
diff --git a/src/assembly/all.xml b/src/assembly/all.xml
index 2588fe2c..0081d929 100644
--- a/src/assembly/all.xml
+++ b/src/assembly/all.xml
@@ -11,6 +11,8 @@
                 <include>org.springframework.ldap:spring-ldap-core</include>
                 <include>org.springframework.ldap:spring-ldap-core-tiger</include>
                 <include>org.springframework.ldap:spring-ldap-odm</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-core</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-batch</include>
                 <include>org.springframework.ldap:spring-ldap-test</include>
             </includes>
             <binaries>
diff --git a/src/assembly/minimal.xml b/src/assembly/minimal.xml
index 918953e9..faec3416 100644
--- a/src/assembly/minimal.xml
+++ b/src/assembly/minimal.xml
@@ -14,6 +14,8 @@
                 <include>org.springframework.ldap:spring-ldap-core</include>
                 <include>org.springframework.ldap:spring-ldap-core-tiger</include>
                 <include>org.springframework.ldap:spring-ldap-odm</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-core</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-batch</include>
                 <include>org.springframework.ldap:spring-ldap-test</include>
             </includes>
             <binaries>
diff --git a/src/assembly/sources.xml b/src/assembly/sources.xml
index a46d5fc4..5715bf2c 100644
--- a/src/assembly/sources.xml
+++ b/src/assembly/sources.xml
@@ -18,6 +18,14 @@
             <directory>odm/src/main/java</directory>
             <outputDirectory/>
         </fileSet>
+        <fileSet>
+            <directory>ldif/ldif-core/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
+        <fileSet>
+            <directory>ldif/ldif-batch/src/main/java</directory>
+            <outputDirectory/>
+        </fileSet>
         <fileSet>
             <directory>test-support/src/main/java</directory>
             <outputDirectory/>
diff --git a/src/assembly/with-dependencies.xml b/src/assembly/with-dependencies.xml
index 7d8b217e..7fae2df2 100644
--- a/src/assembly/with-dependencies.xml
+++ b/src/assembly/with-dependencies.xml
@@ -14,6 +14,8 @@
                 <include>org.springframework.ldap:spring-ldap-core</include>
                 <include>org.springframework.ldap:spring-ldap-core-tiger</include>
                 <include>org.springframework.ldap:spring-ldap-odm</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-core</include>
+                <include>org.springframework.ldap:spring-ldap-ldif-batch</include>
                 <include>org.springframework.ldap:spring-ldap-test</include>
             </includes>
             <binaries>