diff --git a/automake-1.13.1-disable-tests.patch b/automake-1.13.1-disable-tests.patch
deleted file mode 100644
index 5fc5086..0000000
--- a/automake-1.13.1-disable-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
-index 591b4f0..20a9398 100644
---- a/t/list-of-tests.mk
-+++ b/t/list-of-tests.mk
-@@ -1202,16 +1200,6 @@ t/upc2.sh \
- t/upc3.sh \
- t/vala-configure.sh \
- t/vala-grepping.sh \
--t/vala-headers.sh \
--t/vala-libs.sh \
--t/vala-mix.sh \
--t/vala-mix2.sh \
--t/vala-non-recursive-setup.sh \
--t/vala-parallel.sh \
--t/vala-per-target-flags.sh \
--t/vala-recursive-setup.sh \
--t/vala-vapi.sh \
--t/vala-vpath.sh \
- t/vars.sh \
- t/vars3.sh \
- t/var-recurs.sh \
diff --git a/automake-1.15-disable-vala-tests.patch b/automake-1.15-disable-vala-tests.patch
new file mode 100644
index 0000000..dbbbe3f
--- /dev/null
+++ b/automake-1.15-disable-vala-tests.patch
@@ -0,0 +1,28 @@
+From: Pavel Raiskup <praiskup@redhat.com>
+Date: Tue, 7 Jul 2015 11:46:24 +0200
+Subject: [PATCH] tests: disable vala testcases
+
+Currently broken vala installation in Fedora?  Upstream thread:
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12522
+
+diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
+index 9363ee3..b99f15c 100644
+--- a/t/list-of-tests.mk
++++ b/t/list-of-tests.mk
+@@ -1239,16 +1239,6 @@ t/upc2.sh \
+ t/upc3.sh \
+ t/vala-configure.sh \
+ t/vala-grepping.sh \
+-t/vala-headers.sh \
+-t/vala-libs.sh \
+-t/vala-mix.sh \
+-t/vala-mix2.sh \
+-t/vala-non-recursive-setup.sh \
+-t/vala-parallel.sh \
+-t/vala-per-target-flags.sh \
+-t/vala-recursive-setup.sh \
+-t/vala-vapi.sh \
+-t/vala-vpath.sh \
+ t/vars.sh \
+ t/vars3.sh \
+ t/var-recurs.sh \
diff --git a/automake.spec b/automake.spec
index 6e0c33c..5dfdd47 100644
--- a/automake.spec
+++ b/automake.spec
@@ -6,7 +6,7 @@
 Summary:    A GNU tool for automatically creating Makefiles
 Name:       automake
 Version:    %{api_version}
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:    GPLv2+ and GFDL and Public Domain and MIT
@@ -16,9 +16,8 @@ Source:     ftp://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source2:    http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
 Source3:    http://git.savannah.gnu.org/cgit/config.git/plain/config.guess
 
-# Disable tests for broken vala installation
-# ~> downstream
-Patch0:     %{name}-1.13.1-disable-tests.patch
+# Keep those patches in 'git format-patch' format (with docs).
+Patch0:     automake-1.15-disable-vala-tests.patch
 
 URL:        http://www.gnu.org/software/automake/
 Requires:   autoconf >= 2.65
@@ -67,8 +66,7 @@ like to use its ability to automatically generate GNU standard
 Makefiles.
 
 %prep
-%setup -q -n automake-%{version}
-%patch0 -p1 -b .disable_tests
+%autosetup -p1
 autoreconf -iv
 
 file=`find -name config.sub | head -1`
@@ -116,6 +114,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jul 07 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-4
+- use %%autosetup macro
+
 * Tue Jun 23 2015 Pavel Raiskup <praiskup@redhat.com> - 1.15-3
 - add perl-Thread-Queue BR to avoid FTBFS