diff --git a/modules/api/pom.xml b/modules/api/pom.xml
index 59e2a3f..f7476ec 100644
--- a/modules/api/pom.xml
+++ b/modules/api/pom.xml
@@ -34,7 +34,7 @@
 							<Implementation-Version>${project.version}</Implementation-Version>
 							<Implementation-Vendor>Odysseus Software GmbH</Implementation-Vendor>
 							<Implementation-Vendor-Id>de.odysseus</Implementation-Vendor-Id>
-							<Export-Package>javax.el</Export-Package>
+							<Export-Package>javax.el;version=${project.version}</Export-Package>
 							<Bundle-Vendor>Odysseus.de</Bundle-Vendor>
 							<Bundle-Version>${project.version}</Bundle-Version>
 							<Bundle-Name>Expression Language API</Bundle-Name>
diff --git a/modules/impl/pom.xml b/modules/impl/pom.xml
index 95e2739..7eb03d0 100644
--- a/modules/impl/pom.xml
+++ b/modules/impl/pom.xml
@@ -36,7 +36,7 @@
 							<Implementation-Vendor-Id>de.odysseus</Implementation-Vendor-Id>
 							<Main-Class>de.odysseus.el.tree.impl.Builder</Main-Class>
 							<Import-Package>javax.el</Import-Package>
-							<Export-Package>de.odysseus.el,de.odysseus.el.util</Export-Package>
+							<Export-Package>de.odysseus.el;version=${project.version},de.odysseus.el.util;version=${project.version}</Export-Package>
 							<Bundle-Vendor>Odysseus.de</Bundle-Vendor>
 							<Bundle-Version>${project.version}</Bundle-Version>
 							<Bundle-Name>Expression Language Implementation</Bundle-Name>
diff --git a/pom.xml b/pom.xml
index 702a986..a3420f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.5.1</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>1.8</source>
+					<target>1.8</target>
 					<optimize>true</optimize>
 				</configuration>
 			</plugin>