diff --git a/.gitignore b/.gitignore
index ce6cf9a..7c43f18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/ucx-1.6.1.tar.gz
+SOURCES/ucx-1.8.0.tar.gz
diff --git a/.ucx.metadata b/.ucx.metadata
index e11fa06..a39c193 100644
--- a/.ucx.metadata
+++ b/.ucx.metadata
@@ -1 +1 @@
-c2c05c9bf95ace4677a64f535e1ed84652b0cffd SOURCES/ucx-1.6.1.tar.gz
+96f2fe1918127edadcf5b195b6532da1da3a74fa SOURCES/ucx-1.8.0.tar.gz
diff --git a/SPECS/ucx.spec b/SPECS/ucx.spec
index df53f76..b8aca55 100644
--- a/SPECS/ucx.spec
+++ b/SPECS/ucx.spec
@@ -13,22 +13,29 @@
 %bcond_with    rocm
 %bcond_with    ugni
 %bcond_with    xpmem
+%bcond_with    java
 
 Name: ucx
-Version: 1.6.1
+Version: 1.8.0
 Release: 1%{?dist}
 Summary: UCX is a communication library implementing high-performance messaging
+Group: System Environment/Libraries
 
 License: BSD
 URL: http://www.openucx.org
-Source: https://github.com/openucx/%{name}/releases/download/v1.6.1/ucx-1.6.1.tar.gz
+Source: https://github.com/openucx/%{name}/releases/download/v1.8.0/ucx-1.8.0.tar.gz
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # UCX currently supports only the following architectures
 ExclusiveArch: aarch64 ppc64le x86_64
 
-BuildRequires: automake autoconf libtool gcc-c++ numactl-devel
+BuildRequires: automake autoconf libtool gcc-c++
+%if "%{_vendor}" == "suse"
+BuildRequires: libnuma-devel
+%else
+BuildRequires: numactl-devel
+%endif
 %if %{with cma}
 BuildRequires: glibc-devel >= 2.15
 %endif
@@ -53,6 +60,9 @@ BuildRequires: hsa-rocr-dev
 %if %{with xpmem}
 BuildRequires: xpmem-devel
 %endif
+%if %{with java}
+BuildRequires: maven
+%endif
 
 %description
 UCX stands for Unified Communication X. UCX provides an optimized communication
@@ -63,10 +73,16 @@ available, TCP is used instead. UCX supports efficient transfer of data in
 either main memory (RAM) or GPU memory (through CUDA and ROCm libraries).
 In addition, UCX provides efficient intra-node communication, by leveraging the
 following shared memory mechanisms: posix, sysv, cma, knem, and xpmem.
+This package was built from '' branch, commit c30b7da.
+
+%if "%{_vendor}" == "suse"
+%debug_package
+%endif
 
 %package devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: Header files required for developing with UCX
+Group: Development/Libraries
 
 %description devel
 Provides header files and examples for developing with UCX.
@@ -92,6 +108,7 @@ Provides header files and examples for developing with UCX.
            %_with_arg rocm rocm \
            %_with_arg xpmem xpmem \
            %_with_arg ugni ugni \
+           %_with_arg java java \
            %{?configure_options}
 make %{?_smp_mflags} V=1
 
@@ -125,6 +142,7 @@ rm -f %{buildroot}%{_libdir}/ucx/lib*.a
 %package cma
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX CMA support
+Group: System Environment/Libraries
 
 %description cma
 Provides CMA (Linux cross-memory-attach) transport for UCX. It utilizes the
@@ -139,6 +157,7 @@ process.
 %package cuda
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX CUDA support
+Group: System Environment/Libraries
 
 %description cuda
 Provide CUDA (NVIDIA GPU) support for UCX. Enables passing GPU memory pointers
@@ -155,6 +174,7 @@ technology for direct data transfer between GPU and RDMA devices.
 %package gdrcopy
 Requires: %{name}-cuda%{?_isa} = %{version}-%{release}
 Summary: UCX GDRCopy support
+Group: System Environment/Libraries
 
 %description gdrcopy
 Provide GDRCopy support for UCX. GDRCopy is a low-latency GPU memory copy
@@ -168,6 +188,7 @@ library, built on top of the NVIDIA GPUDirect RDMA technology.
 %package ib
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX RDMA support
+Group: System Environment/Libraries
 
 %description ib
 Provides support for IBTA-compliant transports for UCX. This includes RoCE,
@@ -183,6 +204,7 @@ hardware-offloaded data transfer.
 %package ib-cm
 Requires: %{name}-ib%{?_isa} = %{version}-%{release}
 Summary: UCX InfiniBand connection-manager support
+Group: System Environment/Libraries
 
 %description ib-cm
 Provides Infiniband Connection Manager (also known as ibcm) support for UCX.
@@ -195,6 +217,7 @@ Provides Infiniband Connection Manager (also known as ibcm) support for UCX.
 %package knem
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX KNEM transport support
+Group: System Environment/Libraries
 
 %description knem
 Provides KNEM (fast inter-process copy) transport for UCX. KNEM is a Linux
@@ -209,6 +232,7 @@ for large messages.
 %package rdmacm
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX RDMA connection manager support
+Group: System Environment/Libraries
 
 %description rdmacm
 Provides RDMA connection-manager support to UCX, which enables client/server
@@ -222,6 +246,7 @@ based connection establishment for RDMA-capable transports.
 %package rocm
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX ROCm GPU support
+Group: System Environment/Libraries
 
 %description rocm
 Provides Radeon Open Compute (ROCm) Runtime support for UCX.
@@ -234,6 +259,7 @@ Provides Radeon Open Compute (ROCm) Runtime support for UCX.
 %package rocmgdr
 Requires: %{name}-rocm%{?_isa} = %{version}-%{release}
 Summary: UCX GDRCopy support for ROCM
+Group: System Environment/Libraries
 
 %description rocmgdr
 Provide GDRCopy support for UCX ROCM. GDRCopy is a low-latency GPU memory copy
@@ -248,6 +274,7 @@ library, built on top of the NVIDIA GPUDirect RDMA technology.
 %package ugni
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX Gemini/Aries transport support.
+Group: System Environment/Libraries
 
 %description ugni
 Provides Gemini/Aries transport for UCX.
@@ -260,6 +287,7 @@ Provides Gemini/Aries transport for UCX.
 %package xpmem
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Summary: UCX XPMEM transport support.
+Group: System Environment/Libraries
 
 %description xpmem
 Provides XPMEM transport for UCX. XPMEM is a Linux kernel module that enables a
@@ -269,10 +297,24 @@ process to map the memory of another process into its virtual address space.
 %{_libdir}/ucx/libuct_xpmem.so.*
 %endif
 
+%if %{with java}
+%package java
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: UCX Java bindings
+Group: System Environment/Libraries
+
+%description java
+Provides java bindings for UCX.
+
+%files java
+%{_libdir}/jucx-*.jar
+%endif
 
 %changelog
-* Sat Jul 20 2019 Yossi Itigin <yosefe@mellanox.com> 1.6.1-1
-- Bump version to 1.6.1
+* Sun Sep 22 2019 Yossi Itigin <yosefe@mellanox.com> 1.8.0-1
+- Bump version to 1.8.0
+* Sun Mar 24 2019 Yossi Itigin <yosefe@mellanox.com> 1.7.0-1
+- Bump version to 1.7.0
 * Thu Jan 24 2019 Yossi Itigin <yosefe@mellanox.com> 1.6.0-1
 - Add cma, knem, and xpmem sub-packages
 * Tue Nov 20 2018 Yossi Itigin <yosefe@mellanox.com> 1.6.0-1