diff --git a/.gitignore b/.gitignore
index 7a6eab9..415ea7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/ncurses-6.2-20200222.tgz
-/ncurses-6.2-20200222.tgz.asc
+/ncurses-6.2-20210501.tgz
+/ncurses-6.2-20210501.tgz.asc
diff --git a/ncurses-config.patch b/ncurses-config.patch
index d3555f6..0ca7075 100644
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@@ -1,18 +1,18 @@
-diff -up ncurses-6.2-20200222/misc/gen-pkgconfig.in.config ncurses-6.2-20200222/misc/gen-pkgconfig.in
---- ncurses-6.2-20200222/misc/gen-pkgconfig.in.config	2020-02-12 01:09:26.000000000 +0100
-+++ ncurses-6.2-20200222/misc/gen-pkgconfig.in	2020-02-26 15:46:18.899263947 +0100
-@@ -80,7 +80,7 @@ if [ "$includedir" != "/usr/include" ];
+diff -up ncurses-6.2-20210501/misc/gen-pkgconfig.in.config ncurses-6.2-20210501/misc/gen-pkgconfig.in
+--- ncurses-6.2-20210501/misc/gen-pkgconfig.in.config	2021-05-04 15:25:14.136139064 +0200
++++ ncurses-6.2-20210501/misc/gen-pkgconfig.in	2021-05-04 15:26:46.473363104 +0200
+@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ];
  fi
  
  lib_flags=
--for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
+-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
 +for opt in -L$libdir @LIBS@
  do
  	case $opt in
  	-l*) # LIBS is handled specially below
-diff -up ncurses-6.2-20200222/misc/ncurses-config.in.config ncurses-6.2-20200222/misc/ncurses-config.in
---- ncurses-6.2-20200222/misc/ncurses-config.in.config	2020-02-03 00:34:34.000000000 +0100
-+++ ncurses-6.2-20200222/misc/ncurses-config.in	2020-02-26 15:47:12.827386582 +0100
+diff -up ncurses-6.2-20210501/misc/ncurses-config.in.config ncurses-6.2-20210501/misc/ncurses-config.in
+--- ncurses-6.2-20210501/misc/ncurses-config.in.config	2021-04-18 00:22:52.000000000 +0200
++++ ncurses-6.2-20210501/misc/ncurses-config.in	2021-05-04 15:28:41.567642360 +0200
 @@ -41,7 +41,6 @@ exec_prefix="@exec_prefix@"
  
  bindir="@bindir@"
@@ -25,22 +25,28 @@ diff -up ncurses-6.2-20200222/misc/ncurses-config.in.config ncurses-6.2-20200222
  # There is no portable way to find the list of standard library directories. 
  # Require a POSIX shell anyway, to keep this simple.
  lib_flags=
--for opt in -L$libdir @LDFLAGS@ @EXTRA_LDFLAGS@ $LIBS
+-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
 +for opt in $LIBS
  do
  	case $opt in
  	-specs*) # ignore linker specs-files which were used to build library
-@@ -113,9 +112,6 @@ do
- 	-L*)
- 		[ -d ${opt##-L} ] || continue
- 		case ${opt##-L} in
+@@ -114,13 +113,13 @@ do
+ 		lib_check=`echo "x$opt" | sed -e 's/^.-L//'`
+ 		[ -d "$lib_check" ] || continue
+ 		case "$lib_check" in
 -		@LD_SEARCHPATH@) # skip standard libdir
--			continue
--			;;
- 		*)
- 			found=no
- 			for check in $lib_flags
-@@ -235,7 +231,6 @@ ENDECHO
++		////) # skip standard libdir (disabled for multilib)
+ 			if [ "$lib_check" = "$libdir" ]
+ 			then
+ 				lib_first=yes
+ 				IFS_save="$IFS"
+ 				IFS='|'
+-				LIBDIRS="@LD_SEARCHPATH@"
++				LIBDIRS=""
+ 				for lib_check in $LIBDIRS
+ 				do
+ 					if [ -d "$lib_check" ]
+@@ -268,7 +267,6 @@ ENDECHO
  		echo $INCS
  		;;
  	--libdir)
diff --git a/ncurses-kbs.patch b/ncurses-kbs.patch
index 6fcef92..455ae3c 100644
--- a/ncurses-kbs.patch
+++ b/ncurses-kbs.patch
@@ -1,7 +1,7 @@
-diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/terminfo.src
---- ncurses-6.1-20191109/misc/terminfo.src.kbs	2019-11-12 09:23:27.079543254 +0100
-+++ ncurses-6.1-20191109/misc/terminfo.src	2019-11-12 09:24:58.622727887 +0100
-@@ -5952,7 +5952,7 @@ rxvt-basic|rxvt terminal base (X Window
+diff -up ncurses-6.2-20210306/misc/terminfo.src.kbs ncurses-6.2-20210306/misc/terminfo.src
+--- ncurses-6.2-20210306/misc/terminfo.src.kbs	2021-03-11 12:05:15.951585254 +0100
++++ ncurses-6.2-20210306/misc/terminfo.src	2021-03-11 12:11:24.568964629 +0100
+@@ -6276,7 +6276,7 @@ rxvt-basic|rxvt terminal base (X Window
  	enacs=\E(B\E)0, flash=\E[?5h$<100/>\E[?5l, home=\E[H,
  	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
  	ind=\n, is1=\E[?47l\E=\E[?1l,
@@ -10,33 +10,33 @@ diff -up ncurses-6.1-20191109/misc/terminfo.src.kbs ncurses-6.1-20191109/misc/te
  	kcbt=\E[Z, kmous=\E[M, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
  	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E>, rmso=\E[27m,
  	rmul=\E[24m,
-@@ -5964,7 +5964,7 @@ rxvt-basic|rxvt terminal base (X Window
+@@ -6288,7 +6288,7 @@ rxvt-basic|rxvt terminal base (X Window
  	    %p9%t\016%e\017%;,
  	sgr0=\E[0m\017, smacs=^N, smcup=\E7\E[?47h, smir=\E[4h,
  	smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=vt100+enq,
--	use=rxvt+pcfkeys, use=vt220+keypad,
-+	use=rxvt+pcfkeys, use=vt220+keypad, use=xterm+kbs,
+-	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad,
++	use=rxvt+pcfkeys, use=vt220+cvis, use=vt220+keypad, use=xterm+kbs,
  # Key Codes from rxvt reference:
  #
  # Note: Shift + F1-F10 generates F11-F20
-@@ -7467,7 +7467,7 @@ screen|VT 100/ANSI X3.64 virtual termina
+@@ -7829,7 +7829,7 @@ screen|VT 100/ANSI X3.64 virtual termina
  	dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K,
  	enacs=\E(B\E)0, flash=\Eg, home=\E[H, hpa=\E[%i%p1%dG,
  	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
 -	ind=\n, indn=\E[%p1%dS, is2=\E)0, kbs=^H, kcbt=\E[Z,
 +	ind=\n, indn=\E[%p1%dS, is2=\E)0, kcbt=\E[Z,
- 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
- 	kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
- 	kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
-@@ -7481,6 +7481,7 @@ screen|VT 100/ANSI X3.64 virtual termina
- 	sgr0=\E[m\017, smacs=^N, smir=\E[4h, smkx=\E[?1h\E=,
+ 	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kf1=\EOP,
+ 	kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR,
+ 	kf4=\EOS, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+@@ -7842,6 +7842,7 @@ screen|VT 100/ANSI X3.64 virtual termina
  	smso=\E[3m, smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd,
- 	E0=\E(B, S0=\E(%p1%c, use=xterm+alt1049, use=ecma+color,
+ 	E0=\E(B, S0=\E(%p1%c, use=vt220+pcedit,
+ 	use=xterm+alt1049, use=ecma+color, use=vt100+enq,
 +	use=xterm+kbs,
  # The bce and status-line entries are from screen 3.9.13 (and require some
  # changes to .screenrc).
  screen-bce|VT 100/ANSI X3.64 virtual terminal with bce,
-@@ -7596,6 +7597,7 @@ screen.xterm-r6|screen customized for X1
+@@ -7957,6 +7958,7 @@ screen.xterm-r6|screen customized for X1
  # on Solaris because Sun's curses implementation gets confused.
  screen.teraterm|disable ncv in teraterm,
  	ncv#127,
diff --git a/ncurses-libs.patch b/ncurses-libs.patch
index bce0f4b..401da11 100644
--- a/ncurses-libs.patch
+++ b/ncurses-libs.patch
@@ -1,16 +1,16 @@
-diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Makefile.in
---- ncurses-6.0-20150810/c++/Makefile.in.libs	2015-08-06 01:15:41.000000000 +0200
-+++ ncurses-6.0-20150810/c++/Makefile.in	2015-08-12 17:07:35.573822650 +0200
-@@ -112,7 +112,7 @@ LOCAL_LIBDIR	= @top_builddir@/lib
- 
- LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
- SHLIB_DIRS	= -L../lib
--SHLIB_LIST	= $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
-+SHLIB_LIST	= $(SHLIB_DIRS) -lform@USE_LIB_SUFFIX@ -lmenu@USE_LIB_SUFFIX@ -lpanel@USE_LIB_SUFFIX@ -lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
+diff -up ncurses-6.2-20210306/c++/Makefile.in.libs ncurses-6.2-20210306/c++/Makefile.in
+--- ncurses-6.2-20210306/c++/Makefile.in.libs	2021-01-23 21:42:08.000000000 +0100
++++ ncurses-6.2-20210306/c++/Makefile.in	2021-03-11 12:02:29.576741101 +0100
+@@ -118,7 +118,7 @@ SHLIB_LIST	= $(SHLIB_DIRS) \
+ 		-l@FORM_NAME@@USE_LIB_SUFFIX@ \
+ 		-l@MENU_NAME@@USE_LIB_SUFFIX@ \
+ 		-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
+-		-lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
++		-lncurses@USE_LIB_SUFFIX@ #@SHLIB_LIST@
  
  LIBROOT		= ncurses++
  
-@@ -147,8 +147,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
+@@ -153,8 +153,7 @@ LDFLAGS_SHARED	= $(TEST_LDFLAGS) $(CFLAG
  LDFLAGS_DEFAULT	= $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)
  
  # flags for library built by this makefile
@@ -20,10 +20,10 @@ diff -up ncurses-6.0-20150810/c++/Makefile.in.libs ncurses-6.0-20150810/c++/Make
  
  AUTO_SRC	= \
  		etip.h
-diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Makefile.in
---- ncurses-6.0-20150810/form/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/form/Makefile.in	2015-08-12 17:08:14.945939259 +0200
-@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+diff -up ncurses-6.2-20210306/form/Makefile.in.libs ncurses-6.2-20210306/form/Makefile.in
+--- ncurses-6.2-20210306/form/Makefile.in.libs	2021-01-23 21:42:08.000000000 +0100
++++ ncurses-6.2-20210306/form/Makefile.in	2021-03-11 12:00:59.001470707 +0100
+@@ -110,7 +110,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib
@@ -32,10 +32,10 @@ diff -up ncurses-6.0-20150810/form/Makefile.in.libs ncurses-6.0-20150810/form/Ma
  
  RPATH_LIST	= @RPATH_LIST@
  RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Makefile.in
---- ncurses-6.0-20150810/menu/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/menu/Makefile.in	2015-08-12 17:09:10.135102716 +0200
-@@ -107,7 +107,7 @@ LINK		= $(LIBTOOL_LINK)
+diff -up ncurses-6.2-20210306/menu/Makefile.in.libs ncurses-6.2-20210306/menu/Makefile.in
+--- ncurses-6.2-20210306/menu/Makefile.in.libs	2020-08-29 16:50:45.000000000 +0200
++++ ncurses-6.2-20210306/menu/Makefile.in	2021-03-11 12:00:59.002470754 +0100
+@@ -110,7 +110,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib
@@ -44,10 +44,10 @@ diff -up ncurses-6.0-20150810/menu/Makefile.in.libs ncurses-6.0-20150810/menu/Ma
  
  RPATH_LIST	= @RPATH_LIST@
  RESULTING_SYMS	= @RESULTING_SYMS@
-diff -up ncurses-6.0-20150810/panel/Makefile.in.libs ncurses-6.0-20150810/panel/Makefile.in
---- ncurses-6.0-20150810/panel/Makefile.in.libs	2015-08-12 17:06:49.072684924 +0200
-+++ ncurses-6.0-20150810/panel/Makefile.in	2015-08-12 17:09:33.324171396 +0200
-@@ -109,7 +109,7 @@ LINK		= $(LIBTOOL_LINK)
+diff -up ncurses-6.2-20210306/panel/Makefile.in.libs ncurses-6.2-20210306/panel/Makefile.in
+--- ncurses-6.2-20210306/panel/Makefile.in.libs	2020-08-29 16:50:45.000000000 +0200
++++ ncurses-6.2-20210306/panel/Makefile.in	2021-03-11 12:00:59.002470754 +0100
+@@ -112,7 +112,7 @@ LINK		= $(LIBTOOL_LINK)
  LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
  
  SHLIB_DIRS	= -L../lib
diff --git a/ncurses.spec b/ncurses.spec
index 96100c0..3d37d30 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -1,8 +1,8 @@
-%global revision 20200222
+%global revision 20210501
 Summary: Ncurses support utilities
 Name: ncurses
 Version: 6.2
-Release: 5.%{revision}%{?dist}
+Release: 6.%{revision}%{?dist}
 License: MIT
 URL: https://invisible-island.net/ncurses/ncurses.html
 Source0: https://invisible-mirror.net/archives/ncurses/current/ncurses-%{version}-%{revision}.tgz
@@ -13,8 +13,7 @@ Patch8: ncurses-config.patch
 Patch9: ncurses-libs.patch
 Patch11: ncurses-urxvt.patch
 Patch12: ncurses-kbs.patch
-BuildRequires: make
-BuildRequires: gcc gcc-c++ gpm-devel pkgconfig gnupg2
+BuildRequires: gcc gcc-c++ gpm-devel gnupg2 make pkgconfig
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -282,11 +281,17 @@ xz NEWS
 %{_libdir}/lib*.a
 
 %changelog
+* Tue May 04 2021 Miroslav Lichvar <mlichvar@redhat.com> 6.2-6.20210501
+- update to 6.2-20210501
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.2-5.20200222
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.2-4.20200222
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+- Use make macros
+- Remove %license definition
+- Add BuildRequires: make
 
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2-3.20200222
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index fb7577e..0635fb0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (ncurses-6.2-20200222.tgz) = 2e77d6786a077ae8a8acca9dfe16c73f82abc5e3705a5086dbdfc1c9458cedc775833f7e8d99d0181bf24faf4f4215361a6fc892ddccfe22e95dfc35abf486ce
-SHA512 (ncurses-6.2-20200222.tgz.asc) = 3294b400c5960511eb78516c308e4d3e27d3f3560c89d139e3af9333f6c513e80415389ea365cfcb81ff4587e245b2c0ac56ad4a6870e11c1639a68a4cf72b0b
+SHA512 (ncurses-6.2-20210501.tgz) = 85a095ae240778b09cab264cab2e21a30549707bfe1ff64300763235408ded1d48a14ed5d73bfb875de9e7ad03be713873d89ea036bd0bee0ebab0cf72669760
+SHA512 (ncurses-6.2-20210501.tgz.asc) = 6ff7135a7e915c4ad776227583a48ba79165789920aa997a0343caab8c226cb5cb523ba24e8cd13101e01684c56b6f78046ea58f9350d63bff609533c3121e48