diff --git a/pom.xml b/pom.xml
index e23607a..3875cad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,55 +1,92 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.googlecode.java-diff-utils</groupId>
-  <artifactId>diffutils</artifactId>
-  <packaging>jar</packaging>
-  <version>1.3.0-SNAPSHOT</version>
-  <name>java-diff-utils</name>
-  <description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>
-  <url>http://code.google.com/p/java-diff-utils/</url>
-  <inceptionYear>2009</inceptionYear>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
-  <scm>
-    <connection>scm:svn:http://java-diff-utils.googlecode.com/svn/trunk/</connection>
-    <developerConnection>scm:svn:https://java-diff-utils.googlecode.com/svn/trunk/</developerConnection>
-    <url>http://code.google.com/p/java-diff-utils/source/browse/</url>
-  </scm>
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-      <comments>A business-friendly OSS license</comments>
-    </license>
-  </licenses>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <type>jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.googlecode.java-diff-utils</groupId>
+	<artifactId>diffutils</artifactId>
+	<packaging>jar</packaging>
+	<version>1.3.0-SNAPSHOT</version>
+
+	<name>java-diff-utils</name>
+	<description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>
+	<url>http://code.google.com/p/java-diff-utils/</url>
+	<inceptionYear>2009</inceptionYear>
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+	<scm>
+		<connection>scm:svn:http://java-diff-utils.googlecode.com/svn/trunk/</connection>
+		<developerConnection>scm:svn:https://java-diff-utils.googlecode.com/svn/trunk/</developerConnection>
+		<url>http://code.google.com/p/java-diff-utils/source/browse/</url>
+	</scm>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+			<comments>A business-friendly OSS license</comments>
+		</license>
+	</licenses>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<type>jar</type>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			
+			<!-- Make this JAR OSGi ready -->
+			<!-- We want to keep packaging type as jar. Therefore we need to customize the MANIFEST.MF. 
+			See http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
+			-->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.3.7</version>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+		</plugins>
+	</build>
+	
 </project>