diff --git a/build.gradle b/build.gradle
index 8e5b2ab..ebd12db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ configure(javaProjects) {
 
     if (!project.properties.containsKey('cfgJavaVersion')) {
         project.ext {
-            cfgJavaVersion = '1.8'
+            cfgJavaVersion = '8'
         }
     }
 
@@ -60,8 +60,10 @@ configure(javaProjects) {
     }
 
     jar {
+        inputs.property("moduleName", moduleName)
         manifest {
             version = project.version.replace("-", ".")
+            attributes('Automatic-Module-Name': moduleName)
         }
     }
 
@@ -73,7 +75,7 @@ configure(javaProjects) {
 
     tasks.withType(JavaCompile) {
         doFirst {
-            if (sourceCompatibility == '1.7' && System.env.JDK7_HOME != null) {
+            if (sourceCompatibility == '7' && System.env.JDK7_HOME != null) {
                 options.fork = true
                 options.bootstrapClasspath = files("$System.env.JDK7_HOME/jre/lib/rt.jar")
             }
@@ -127,6 +129,7 @@ configure(javaProjects) {
         exclude "**/internal/**"
         exclude "**/java-gen/**"
         exclude "**/app/**"
+        options.links "https://docs.oracle.com/javase/$cfgJavaVersion/docs/api/"
     }
 }
 
@@ -206,6 +209,8 @@ task javadocAll(type: Javadoc) {
     classpath += files(distributionProjects.collect { project ->
         project.sourceSets.main.output
     })
+
+    options.links "https://docs.oracle.com/javase/$cfgJavaVersion/docs/api/"
 }
 
 tasks.withType(Tar) {
diff --git a/configuration.gradle b/configuration.gradle
index 85bd4d6..c21f8b0 100644
--- a/configuration.gradle
+++ b/configuration.gradle
@@ -76,6 +76,8 @@ dependencies {
     runtimeOnly group: "ch.qos.logback", name: "logback-classic", version: "1.2.3"
 }
 
+ext.moduleName = 'com.beanit.openiec61850'
+
 jar {
     bnd("Bundle-Name": "OpenIEC61850",
             "Bundle-SymbolicName": "com.beanit.openiec61850",