diff --git a/ncurses-5.9-environment.dif b/ncurses-5.9-environment.dif
deleted file mode 100644
index 06f973d..0000000
--- a/ncurses-5.9-environment.dif
+++ /dev/null
@@ -1,28 +0,0 @@
----
- man/curs_util.3x         |    3 +++
- ncurses/tinfo/lib_data.c |    2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
---- man/curs_util.3x
-+++ man/curs_util.3x	2016-07-07 09:01:21.335637800 +0000
-@@ -172,6 +172,9 @@ ncurses modifies the last step in its co
- checks if the \fBLINES\fR and \fBCOLUMNS\fR environment variables
- are set to a number greater than zero.
- .bP
-+On openSUSE/SUSE Linux the default is \fBTRUE\fR, if you do not want this
-+feature you may use the \fBuse_tioctl\fR routine with \fBFALSE\fR as an argument.
-+.bP
- for each, ncurses updates the corresponding environment variable
- with the value that it has obtained via operating system call
- or from the terminal database.
---- ncurses/tinfo/lib_data.c
-+++ ncurses/tinfo/lib_data.c	2016-07-07 09:01:21.339637723 +0000
-@@ -257,7 +257,7 @@ NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _n
-     NULL,			/* _tputs_trace */
- #endif
- #endif
--    FALSE,			/* use_tioctl */
-+    TRUE,			/* use_tioctl */
- };
- /* *INDENT-ON* */
- 
diff --git a/ncurses.changes b/ncurses.changes
index 5ebfaf3..a3250b5 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 27 09:51:21 UTC 2016 - werner@suse.de
+
+- Drop patch ncurses-5.9-environment.dif as YaST2 ncurses GUI does
+  not need it anymore and as well as it causes bug bsc#1000662 
+
 -------------------------------------------------------------------
 Mon Oct 24 08:44:52 UTC 2016 - werner@suse.de
 
diff --git a/ncurses.spec b/ncurses.spec
index 01aebe4..fa4e450 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -66,7 +66,6 @@ Source7:        baselibs.conf
 Patch0:         ncurses-6.0.dif
 Patch1:         ncurses-5.9-ibm327x.dif
 Patch4:         ncurses-5.7-tack.dif
-Patch5:         ncurses-5.9-environment.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _miscdir    %{_datadir}/misc
 %global         _incdir     %{_includedir}
@@ -278,7 +277,6 @@ tar  xfz %{S:5}
 mv tack-* tack
 %patch1 -p0 -b .327x
 %patch4 -p0 -b .hs
-%patch5 -p0 -b .lc
 %patch0 -p0 -b .p0
 rm -vf include/ncurses_dll.h
 rm -vf mkdirs.sh
@@ -400,6 +398,9 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     # No --enable-xmc-glitch because this seems to break yast2
     # on console/konsole (no magic cookie support on those?)
     #
+    # No --enable-hard-tabs for users which have disabled
+    # the use of tabs
+    #
     touch --reference=README config.sub config.guess
     > $SCREENLOG
     tail -q -s 0.5 -f $SCREENLOG & pid=$!
@@ -420,6 +421,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	--with-gpm		\
 %endif
 	--with-dlsym		\
+	--with-terminfo-dirs=%{_sysconfdir}/terminfo:%{_datadir}/terminfo \
 	--with-termlib=tinfo	\
 	--with-ticlib=tic	\
 	--with-xterm-kbs=del	\
@@ -532,6 +534,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 	EOF
 %endif
     # must not use %jobs here (would lead to: ln: ncurses.h already exists)
+    find man/ -name '*.[1-8]x.*' | xargs -r rm -vf
     make install DESTDIR=%{root} includedir=%{_incdir} includesubdir=/ncurses libdir=%{_libdir}
     ln -sf %{_incdir}/ncurses/{curses,ncurses,term,termcap}.h %{root}%{_incdir}
     sh %{S:6} --cflags "-D_GNU_SOURCE -I%{_incdir}/ncurses" --libs "-lncurses" --libs "-ltinfo" %{root}%{_bindir}/ncurses6-config
@@ -778,7 +781,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
     install -m 644 %{S:3}			%{buildroot}%{_defaultdocdir}/ncurses/
     install -m 644 README			%{buildroot}%{_defaultdocdir}/ncurses/
     install -m 644 NEWS				%{buildroot}%{_defaultdocdir}/ncurses/
-    mkdir -p %{buildroot}%{_sysconfdir}
+    mkdir -p %{buildroot}%{_sysconfdir}/terminfo
     mkdir -p %{buildroot}%{_miscdir}
     LD_LIBRARY_PATH=%{buildroot}%{_libdir}:%{buildroot}/%{_lib}
     export LD_LIBRARY_PATH
@@ -873,6 +876,7 @@ sed -ri '/^iTerm/{s@iterm\|@@}' misc/terminfo.src
 %defattr(-,root,root)
 %{_sysconfdir}/termcap
 %config %{_miscdir}/termcap
+%dir %{_sysconfdir}/terminfo
 %dir %{_datadir}/tabset/
 %dir %{_datadir}/terminfo/
 %dir %{_datadir}/terminfo/*/