diff --git a/git.spec b/git.spec
index 8ab812f..dc3e5bc 100644
--- a/git.spec
+++ b/git.spec
@@ -27,10 +27,10 @@ BuildRequires:	pkgconfig(zlib)
 Requires:	git-core = %{EVRD}
 Requires:	git-svn = %{EVRD}
 Requires:	git-email = %{EVRD}
-Suggests:	gitk = %{EVRD}
-Suggests:	git-arch = %{EVRD}
-Suggests:	git-core-oldies = %{EVRD}
-Suggests:	git-cvs = %{EVRD}
+Recommends:	gitk = %{EVRD}
+Recommends:	git-arch = %{EVRD}
+Recommends:	git-core-oldies = %{EVRD}
+Recommends:	git-cvs = %{EVRD}
 Obsoletes:	python-git < 1:2.11
 
 %description
@@ -52,7 +52,7 @@ This is a dummy package which brings in all subpackages.
 Summary:	Global Information Tracker
 Group:		Development/Other
 Requires:	diffutils
-Suggests:	git-prompt
+Recommends:	git-prompt
 Requires:	less
 Requires:	openssh-clients
 Requires:	rsync
@@ -163,8 +163,8 @@ Git tools for importing Subversion repositories.
 Summary:	Git tools for importing CVS repositories
 Group:		Development/Other
 Requires:	git-core = %{EVRD}
-Suggests:	cvs
-Suggests:	cvsps
+Recommends:	cvs
+Recommends:	cvsps
 
 %description -n git-cvs
 Git tools for importing CVS repositories.
@@ -180,7 +180,7 @@ Git tools for importing CVS repositories.
 Summary:	Git tools for importing Arch repositories
 Group:		Development/Other
 Requires:	git-core = %{EVRD}
-Suggests:	tla
+Recommends:	tla
 
 %description -n git-arch
 Git tools for importing Arch repositories.
@@ -195,8 +195,8 @@ Git tools for importing Arch repositories.
 Summary:	Git tools for sending email
 Group:		Development/Other
 Requires:	git-core = %{EVRD}
-Suggests:	perl-Authen-SASL
-Suggests:	perl-MIME-Base64
+Recommends:	perl-Authen-SASL
+Recommends:	perl-MIME-Base64
 
 %description -n git-email
 Git tools for sending email.
@@ -276,7 +276,7 @@ perl -pi -e 's!^(GITWEB_CSS|GITWEB_LOGO|GITWEB_FAVICON) = !$1 = /gitweb/!' Makef
 %build
 # same flags and prefix must be passed for make test too
 %define git_make_params prefix=%{_prefix} gitexecdir=%{_libdir}/git-core CFLAGS="%{optflags}" GITWEB_CONFIG=%{_sysconfdir}/gitweb.conf DOCBOOK_XSL_172=1
-%make %{git_make_params} all doc gitweb
+%make_build %{git_make_params} all doc gitweb
 
 # Produce RelNotes.txt.gz
 # sed trick changes "-x.y.z.txt" to "-x.y.z.0.txt" for ordering, then undoes it
@@ -287,7 +287,7 @@ cd Documentation/RelNotes \
 
 %install
 mkdir -p %{buildroot}%{_bindir}
-%makeinstall_std prefix=%{_prefix} gitexecdir=%{_libdir}/git-core  CFLAGS="%{optflags}"
+%make_install prefix=%{_prefix} gitexecdir=%{_libdir}/git-core  CFLAGS="%{optflags}"
 make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core   DESTDIR=%{buildroot}
 
 # Avoid dependencies on obscure perl modules
@@ -354,4 +354,4 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_bra
 # replies from svn versions older than the one
 # we're shipping -- and they have changed since
 rm -f t/t5700-protocol-v1.sh
-LC_ALL=C %make %{git_make_params} test NO_SVN_TESTS=true
+LC_ALL=C %make_build %{git_make_params} test NO_SVN_TESTS=true