diff --git a/java-1_8_0-openj9.changes b/java-1_8_0-openj9.changes
new file mode 100644
index 0000000..189c45c
--- /dev/null
+++ b/java-1_8_0-openj9.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Mon Jan 27 11:50:27 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of OpenJDK 1.8.0_242-b08 with OpenJ9 0.18.1
diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 2d16ee7..e5ec210 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -85,14 +85,13 @@
 %global imagestarget images
 %endif
 %global bits 64
-ExclusiveArch:  x86_64 ppc64le s390x
 Name:           java-1_8_0-openj9
 Version:        %{javaver}.%{updatever}
 Release:        0
-Summary:        OpenJDK 8 Runtime Environment with OpenJ9 virtual machine
+Summary:        OpenJDK 8 Runtime Environment with Eclipse OpenJ9 virtual machine
 License:        Apache-1.1 AND Apache-2.0 AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only WITH Classpath-exception-2.0 AND LGPL-2.0-only AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C
 Group:          Development/Languages/Java
-URL:            http://openjdk.java.net/
+URL:            https://www.eclipse.org/openj9/
 # Sources from upstream OpenJDK8 project.
 Source0:        %{root_repository}/%{root_revision}.zip
 Source1:        %{omr_repository}/%{omr_revision}.zip
@@ -106,9 +105,7 @@ Source12:       policytool.desktop.in
 Source13:       nss.cfg
 # Ensure we aren't using the limited crypto policy
 Source14:       TestCryptoLevel.java
-
 Source100:      openj9-nogit.patch.in
-
 # RPM/distribution specific patches
 # Restrict access to java-atk-wrapper classes
 Patch1:         java-atk-wrapper-security.patch
@@ -116,13 +113,11 @@ Patch1:         java-atk-wrapper-security.patch
 Patch2:         multiple-pkcs11-library-init.patch
 # Disable doclint for compatibility
 Patch3:         disable-doclint-by-default.patch
-
 # Patches for system libraries
 Patch201:       system-libjpeg.patch
 Patch202:       system-libpng.patch
 Patch203:       system-lcms.patch
 Patch205:       link-with-as-needed.patch
-
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -137,6 +132,12 @@ BuildRequires:  gcc-c++
 BuildRequires:  giflib-devel
 BuildRequires:  git
 BuildRequires:  gtk2-devel
+BuildRequires:  java-ca-certificates
+BuildRequires:  libX11-devel
+BuildRequires:  libXi-devel
+BuildRequires:  libXinerama-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libXtst-devel
 BuildRequires:  libdwarf-devel
 BuildRequires:  libelf-devel
 BuildRequires:  libjpeg-devel
@@ -159,6 +160,8 @@ Requires:       fontconfig
 # java.io.FileNotFoundException: /usr/lib64/libnss3.so
 #was bnc#634793
 Requires:       mozilla-nss
+Requires(post): file
+Requires(post): java-ca-certificates
 # Standard JPackage base provides.
 Provides:       java = %{javaver}
 Provides:       java-%{javaver} = %{version}-%{release}
@@ -188,23 +191,15 @@ Provides:       jre1.5.x
 Provides:       jre1.6.x
 Provides:       jre1.7.x
 Provides:       jre1.8.x
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libX11-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libXinerama-devel
-BuildRequires:  libXt-devel
-BuildRequires:  libXtst-devel
-
+ExclusiveArch:  x86_64 ppc64le s390x
 %if %{bootcycle}
 BuildRequires:  java-devel >= 1.7
-BuildConflicts: java-devel >= 9 java-headless >= 9 java >= 9
+BuildConflicts: java >= 9
+BuildConflicts: java-devel >= 9
+BuildConflicts: java-headless >= 9
 %else
 BuildRequires:  %{name}-devel
 %endif
-#BuildIgnore java-headless >= 9
-BuildRequires:  java-ca-certificates
-Requires(post): file
-Requires(post): java-ca-certificates
 # pulse audio requirements
 %if %{with_pulseaudio}
 BuildRequires:  libpulse-devel >= 0.9.11
@@ -212,13 +207,18 @@ BuildRequires:  pulseaudio >= 0.9.11
 %endif
 
 %description
-The OpenJDK 8 runtime environment.
+The OpenJDK 8 with Eclipse OpenJ9 virtual machine. Eclipse OpenJ9
+is a Java Virtual Machine for OpenJDK that is optimized for small
+footprint, fast start-up, and high throughput.
+
+Supported architectures are ppc64le, s390x and x86_64
 
 %package headless
-Summary:        OpenJDK 8 Runtime Environment
+Summary:        OpenJDK 8 Runtime Environment with Eclipse OpenJ9
 # Require jpackage-utils for ownership of /usr/lib/jvm/
 Group:          Development/Languages/Java
 Requires:       jpackage-utils
+Requires(post): tzdata-java8
 # Post requires update-alternatives to install tool update-alternatives.
 Requires(post): update-alternatives
 # Postun requires update-alternatives to uninstall tool update-alternatives.
@@ -245,13 +245,14 @@ Provides:       jndi-dns = %{version}
 Provides:       jndi-ldap = %{version}
 Provides:       jndi-rmi = %{version}
 Provides:       jsse = %{version}
-Requires(post): tzdata-java8
 
 %description headless
 The OpenJDK 8 runtime environment without audio and video support.
 
+Supported architectures are ppc64le, s390x and x86_64
+
 %package devel
-Summary:        OpenJDK 8 Development Environment
+Summary:        OpenJDK 8 Development Environment with Eclipse OpenJ9
 # Require base package.
 Group:          Development/Languages/Java
 Requires:       %{name} = %{version}-%{release}