diff --git a/baselibs.conf b/baselibs.conf
index c948836..cff0c8e 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -4,8 +4,10 @@ libncurses5
   obsoletes "ncurses-<targettype> <= <version>"
 libncurses6
   targettype x86 provides "baselibs-x86:<prefix>/lib/libncurses.so.6"
-  provides "libncurses6-<targettype> = 6.0"
+  provides "libncurses6-<targettype> = <version>"
 ncurses-devel
+  requires -ncurses-<targettype>
+  requires "libncurses6-<targettype> = <version>"
+ncurses5-devel
   requires -ncurses-<targettype>
   requires "libncurses5-<targettype> = <version>"
-  requires "libncurses6-<targettype> = 6.0"
diff --git a/ncurses-6.1-patches.tar.bz2 b/ncurses-6.1-patches.tar.bz2
index a71df9d..9f15735 100644
--- a/ncurses-6.1-patches.tar.bz2
+++ b/ncurses-6.1-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a949e2d78dc242d1ada722ff3b37b1f16b032d9c1525576c20b2f939dd0911b
-size 91010
+oid sha256:539c0f5d4f44cc85c8ff148facc500a3f7553fc07e6d3c266fa8e9e00a9751f5
+size 92912
diff --git a/ncurses.changes b/ncurses.changes
index 69d4f5e..fb595b5 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Mar 21 07:46:36 UTC 2018 - werner@suse.de
+
+- Change baselibs.conf to avoid mixed version requirements (bsc#1082744)
+
+-------------------------------------------------------------------
+Mon Mar 19 09:23:35 UTC 2018 - werner@suse.de
+
+- Add ncurses patch 6.1-20180317
+  + fix a check in infotocap which may not have detected a problem when
+    it should have.
+  + add a check in tic for the case where setf/setb are given using
+    different strings, but provide identical results to setaf/setab.
+  + further improve fix for terminfo.5 (patch by Kir Kolyshkin).
+  + reorder loop-limit checks in winsnstr() in case the string has no
+    terminating null and only the number of characters is used (patch
+    by Gyorgy Jeney).
+
+-------------------------------------------------------------------
+Thu Mar  8 10:06:24 UTC 2018 - werner@suse.de
+
+- Avoid opaque libraries for Leap 15 and SLES 15 
+- No tests on Leap 15 and SLES 15
+
 -------------------------------------------------------------------
 Mon Mar  5 07:48:43 UTC 2018 - werner@suse.de
 
diff --git a/ncurses.spec b/ncurses.spec
index 1c9430b..0ba6778 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -433,10 +433,12 @@ mv tack-* tack
 	--enable-interop	\
 	--with-pthread		\
 	--enable-reentrant	\
+%if 0%{?suse_version} > 1500
 	--enable-opaque-curses	\
 	--enable-opaque-form	\
 	--enable-opaque-menu	\
 	--enable-opaque-panel	\
+%endif
 	--enable-ext-mouse	\
 	--enable-widec		\
 	--with-termlib=%{soname_tinfo}	\
@@ -561,6 +563,7 @@ mv tack-* tack
 	ldd ./tack
     popd
     unset LD_LIBRARY_PATH
+%if 0%{?suse_version} > 1500
     #
     # Make the test suite for ncursesw6
     #
@@ -573,6 +576,7 @@ mv tack-* tack
 	mv bin binw
 	make distclean
     popd
+%endif
 %endif
     test ! -L tack || rm -f tack
     make clean
@@ -684,7 +688,7 @@ mv tack-* tack
     #
     # Some tests
     #
-%if 0%{?qemu_user_space_build:1}%{?_crossbuild}
+%if 0%{?qemu_user_space_build:1}%{?_crossbuild} || 0%{?suse_version} <= 1500
 	echo "Skipping tests due to running under QEMU / cross-building"
 %else
     #
@@ -985,6 +989,7 @@ export LD_LIBRARY_PATH
 %if %{with onlytinfo}
 nm -D %{buildroot}/%{_lib}/libtinfo.so.%{version} | grep -q _nc_read_entry2
 %endif
+%if 0%{?suse_version} > 1500
 pushd test
     expect -d <<-'EOF'
 	set env(TERM) xterm
@@ -1014,6 +1019,7 @@ pushd test
 	EOF
 popd
 %endif
+%endif
 
 %post   -n libncurses5 -p /sbin/ldconfig