diff --git a/tomcat-9.0-javadoc.patch b/tomcat-9.0-javadoc.patch
index 1bae546..e054444 100644
--- a/tomcat-9.0-javadoc.patch
+++ b/tomcat-9.0-javadoc.patch
@@ -61,8 +61,9 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
        encoding="UTF-8"
        docencoding="UTF-8"
        charset="UTF-8"
+-      additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
 +      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
++      additionalparam="-breakiterator -notimestamp"
        maxmemory="512m"
        failonerror="true"
 -      failonwarning="true">
@@ -70,3 +71,13 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
        <classpath>
          <path refid="compile.classpath"/>
          <path refid="tomcat.webservices.classpath"/>
+@@ -1868,9 +1873,6 @@
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
+       <link href="../websocketapi"/>
+-      <link href="http://docs.oracle.com/javase/8/docs/api/"/>
+-      <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+-      <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
diff --git a/tomcat.changes b/tomcat.changes
index e85ef27..42312a5 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jan 17 09:34:14 UTC 2018 - fstrba@suse.com
+
+- Modified patch:
+  * tomcat-9.0-javadoc.patch
+    + Don't append to javadoc --add-modules since we are building
+      with source=8
+    + Avoid accessing Internet URLs from build environment
+
 -------------------------------------------------------------------
 Fri Dec  1 21:46:18 UTC 2017 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index f8fa82d..bcb6757 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2009, JPackage Project
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,11 +17,6 @@
 #
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir /var/adm/fillup-templates
-%endif
-
 %define jspspec 2.3
 %define servletspec 4.0
 %define elspec 3.0
@@ -40,6 +35,10 @@
 %define cachedir %{_localstatedir}/cache/%{name}
 %define tempdir %{cachedir}/temp
 %define workdir %{cachedir}/work
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir %{_localstatedir}/adm/fillup-templates
+%endif
 Name:           tomcat
 Version:        %{major_version}.%{minor_version}.%{micro_version}
 Release:        0
@@ -80,8 +79,8 @@ Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pa
 #Patch2:         %{name}-%{major_version}.%{minor_version}-property-build.windows.patch
 # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
 Patch2:         %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch
-# PATCH-FIX-SLE: Change security manager default policies bnc#891264                                                                                                        
-Patch3:         %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch  
+# PATCH-FIX-SLE: Change security manager default policies bnc#891264
+Patch3:         %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch
 # PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
 Patch4:         %{name}-%{major_version}.%{minor_version}-javadoc.patch
 BuildRequires:  ant >= 1.8.1
@@ -98,7 +97,7 @@ BuildRequires:  geronimo-jaxrpc-1_1-api
 BuildRequires:  geronimo-qname-1_1-api
 BuildRequires:  geronimo-saaj-1_1-api
 BuildRequires:  jakarta-taglibs-standard >= 1.1
-BuildRequires:  java-devel = 1.8.0
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -339,7 +338,7 @@ export NO_BRP_CHECK_BYTECODE_VERSION=true
 install -d -m 0755 %{buildroot}%{_bindir}
 install -d -m 0755 %{buildroot}%{_sbindir}
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-install -d -m 0755 %{buildroot}%{_initrddir}
+install -d -m 0755 %{buildroot}%{_initddir}
 install -d -m 0755 %{buildroot}%{_systemddir}
 install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
 install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
@@ -565,11 +564,11 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
 #bnc#565901
 ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
 
-# Install update-alternatives content                                              
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives              
-ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar        
+# Install update-alternatives content
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar
 ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/%{name}-el_1_0_api.jar
-ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar      
+ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar
 ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar
 
 mkdir -p %{buildroot}%{_tmpfilesdir}