diff --git a/findutils-4.6.0-exec-args.patch b/findutils-4.6.0-exec-args.patch
index e86b883..7f80aee 100644
--- a/findutils-4.6.0-exec-args.patch
+++ b/findutils-4.6.0-exec-args.patch
@@ -45,7 +45,7 @@ index c1369c3..ab5dbe8 100644
  EXTRA_DIST = $(EXTRA_DIST_EXP) $(EXTRA_DIST_XO) $(EXTRA_DIST_GOLDEN) \
  	$(test_shell_progs) binary_locations.sh checklists.py
 diff --git a/find/testsuite/sv-48030-exec-plus-bug.sh b/find/testsuite/sv-48030-exec-plus-bug.sh
-new file mode 100644
+new file mode 100755
 index 0000000..4dbf149
 --- /dev/null
 +++ b/find/testsuite/sv-48030-exec-plus-bug.sh
diff --git a/findutils.spec b/findutils.spec
index aa0ef9b..71b4dcf 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -57,24 +57,31 @@ You should install findutils because it includes tools that are very
 useful for finding things on your system.
 
 %prep
-%setup -q
-rm -rf locate
-%patch0 -p1
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%autosetup -S git
 
-%patch6 -p1
-chmod 0755 "find/testsuite/sv-48030-exec-plus-bug.sh"
+# drop ignored files and mark them as ignored
+tee -a .gitignore << EOF
+*~
+Makefile.in
+/aclocal.m4
+/autom4te.cache
+/build
+/configure
+/doc/find.info*
+/doc/stamp-vti
+/doc/version.texi
+EOF
+git rm -q -r --cached .
+git add --all .
+git commit -m "drop ignored files"
 
-%patch8 -p1
+git rm -q -r locate
+git commit -q -m "drop the source code of locate"
 
-%patch9 -p1
-chmod 0755 "find/testsuite/sv-48180-refuse-noop.sh"
-
-# needed because of findutils-4.4.0-no-locate.patch
+# needed because of findutils-4.5.15-no-locate.patch
 autoreconf -fiv
+git add --all .
+git commit -q -m "after invocation of autoreconf"
 
 %build
 # prevent test-isinf from failing with gcc-5.3.1 on ppc64le (#1294016)
@@ -122,6 +129,7 @@ fi
 
 %changelog
 * Fri Jun 17 2016 Kamil Dudka <kdudka@redhat.com> - 1:4.6.0-6
+- use %%autosetup to create a git repo in %%prep
 - use out of source build
 - avoid SIGSEGV in case the internal -noop option is used (#1346471)