diff --git a/tomcat.changes b/tomcat.changes
index b2d654b..39acbf9 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 18 15:55:12 UTC 2019 - malbu@suse.com
+
+- Set javac target to 1.8 when building docs samples and serverxmltool
+
 -------------------------------------------------------------------
 Tue Feb  5 09:50:35 UTC 2019 - malbu@suse.com
 
diff --git a/tomcat.spec b/tomcat.spec
index 1d49355..f773e63 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -37,6 +37,7 @@
 %define workdir %{cachedir}/work
 %define tomcatappdir %{_datadir}/%{name}/tomcat-webapps
 %define serverxmltool %{_libexecdir}/%{name}/serverxml-tool.sh
+%define javac_target 1.8
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
@@ -79,8 +80,6 @@ Source1002:     %{name}.keyring
 Patch0:         %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 #PATCH-FIX-UPSTREAM: from jpackage.org package
 Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
-#PATCH-FIX-OPENSUSE: skip few windows specific parts of build
-#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
@@ -104,7 +103,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
+BuildRequires:  java-devel >= 1.8.0
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -313,7 +312,7 @@ rm output/build/bin/commons-daemon.jar \
 
 pushd output/dist/src/webapps/docs/appdev/sample/src
 mkdir -p ../web/WEB-INF/classes
-javac -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
+javac -source %{javac_target} -target %{javac_target} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
 pushd ../web
 jar cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
 popd
@@ -329,7 +328,7 @@ jar ufm output/build/lib/tomcat-api.jar %{SOURCE15}
 jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16}
 
 pushd %{_builddir}/tomcat-serverxml-tool
-javac com/suse/tcserverxml/ApplyStylesheet.java
+javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java
 jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt
 popd