diff --git a/SPECS/netcat/netcat.spec b/SPECS/netcat/netcat.spec
index 9a4fe682f1..5352891310 100644
--- a/SPECS/netcat/netcat.spec
+++ b/SPECS/netcat/netcat.spec
@@ -1,7 +1,7 @@
 Summary:	Netcat is a featured networking utility which reads and writes data across network connections, using the TCP/IP protocol.
 Name:		netcat
 Version:	0.7.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2 
 URL:		http://netcat.sourceforge.net/
 Group:		Productivity/Networking/Other
@@ -19,9 +19,10 @@ It is designed to be a reliable "back-end" tool that can be used directly or eas
 %build
 
 %configure
-make %{?_smp_mflags}
+%make_build
 %install
-make DESTDIR=%{buildroot} install
+%make_install
+rm -rf %{buildroot}%{_infodir}
 
 %clean
 rm -rf %{buildroot}
@@ -31,6 +32,9 @@ rm -rf %{buildroot}
 %{_bindir}
 %{_datadir}
 %changelog
+*   Thu Oct 19 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.1-5
+-   Remove infodir
+-   Use standard build macros
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 0.7.1-4
 -   Use standard configure macros
 *   Wed Jul 27 2016 Divya Thaluru <dthaluru@vmware.com> 0.7.1-3
diff --git a/SPECS/which/which.spec b/SPECS/which/which.spec
index 37eede5e81..b2de520258 100644
--- a/SPECS/which/which.spec
+++ b/SPECS/which/which.spec
@@ -1,7 +1,7 @@
 Summary:	Program shows full path of (shell) commands
 Name:		which
 Version:	2.21
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv3+
 URL:		http://savannah.gnu.org/projects/which
 Source0:	http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
@@ -15,17 +15,19 @@ Program for showing the full the path of (shell) commands.
 %prep
 %setup -q
 %build
-./configure \
-	--prefix=%{_prefix}
-make %{?_smp_mflags}
+%configure
+%make_build
 %install
-make DESTDIR=%{buildroot} install
+%make_install
+rm -rf %{buildroot}%{_infodir}
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-/usr/share/info/*
 %{_mandir}/man1/*
 %changelog
+* Thu Oct 19 2017 Alexey Makhalov <amakhalov@vmware.com> 2.21-5
+- Remove infodir
+- Use standard configure/build macros
 * Mon Oct 02 2017 Alexey Makhalov <amakhalov@vmware.com> 2.21-4
 - Added conflicts toybox
 * Mon Oct 10 2016 ChangLee <changlee@vmware.com> 2.21-3