diff --git a/tomoyo-tools-2.5.0-20120805.tar.gz b/tomoyo-tools-2.5.0-20120805.tar.gz
deleted file mode 100644
index 326581b..0000000
--- a/tomoyo-tools-2.5.0-20120805.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02775b3f48dd08011775cf2b43dec788f7858f74201883eee0705594a25a75dc
-size 210535
diff --git a/tomoyo-tools-2.5.0-20120805.tar.gz.asc b/tomoyo-tools-2.5.0-20120805.tar.gz.asc
deleted file mode 100644
index d4cd367..0000000
--- a/tomoyo-tools-2.5.0-20120805.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEABECAAYFAlAeHZAACgkQUDraOEuXWpgL8QCfcxAabrb18Y47tKOQ4RRGIK9u
-M0cAoJ9cWSnrdlSenQTgQUjp+1uK0zxK
-=/2C4
------END PGP SIGNATURE-----
diff --git a/tomoyo-tools-2.5.0-20140601.tar.gz b/tomoyo-tools-2.5.0-20140601.tar.gz
new file mode 100644
index 0000000..ea6ab8e
--- /dev/null
+++ b/tomoyo-tools-2.5.0-20140601.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:118ef6ba1fbf7c0b83018c3a0d4d5485dfb9b5b7f647f37ce9f63841a3133c2a
+size 211411
diff --git a/tomoyo-tools-2.5.0-20140601.tar.gz.asc b/tomoyo-tools-2.5.0-20140601.tar.gz.asc
new file mode 100644
index 0000000..b0b35dc
--- /dev/null
+++ b/tomoyo-tools-2.5.0-20140601.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJTipqIAAoJEEJfEo0MZPUqHzgQANI2NlDmzbohY9EUg2WLI1Uu
+TQHMzNuB7b4dJGheArv/xfOk1/q6C+d3y55CVqlTr6kP6XAPjD2Si8ZSczDuyqQi
+1b7dYRlYDwsOKSzPAyJDeyCjbe0tnEoIzRhX2FBbknEgUSfk+zfbIQ/kS2ZjeHaI
+hDQNdFiot12rCJiGPJt9uJ7UDK27cJQAG7G25kLU9VOxvdXvq9hZGKjpz1sZBjgO
+nXU5G8gtYziI/4If6xW647VZrykmbg+SHGjd3dEgRNKe2uyDwZSQwvmC/wx6+F/X
+pjeML3WHyZB78Mo2xj+EkkPnoXYsv07cKtcxwx/F2Z6GvcToNUrOEQvaL5eSJosA
+mpY6SFfFN0qaK6UA5OZabbkoLAGx9Rrc00B0MytdexwIolFQdbQLjrtQF6bkDJCC
+x7j8gMiNTXPjJAyi8sm2raciAOmJeBMZ/208Gsui/O/ARCuXsYSzD7vwDT9vHIUS
+/yGZUL7A3on0vEW6iiapw9QmbUk9ptaGpPw0XCMtpmKtH4T/uiIph8Q57GZpqs76
+VGCPNKvpK8CCzh5zEbWIXm+Br2e6E0vyI4nFYvflT5D4icaJrXi9byVOZMfvQrGe
+TT2nwiAvHik614ABhSKZ73mXkvp6RILs9vw5Vs0owuHZyv0WO17LWGsgczwByPQ9
+1F+JDK2wCo/SpO4Hnfgy
+=QYeK
+-----END PGP SIGNATURE-----
diff --git a/tomoyo-tools.changes b/tomoyo-tools.changes
index 6500c15..a56e5e9 100644
--- a/tomoyo-tools.changes
+++ b/tomoyo-tools.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Tue Jun  9 06:58:58 UTC 2015 - meissner@suse.com
+
+- tomoyo-tools.keyring: use new key from upstream maintainer
+
+-------------------------------------------------------------------
+Tue May 26 14:30:30 UTC 2015 - dgutu@suse.com
+
+- Spec-cleaner cleanup 
+
+-------------------------------------------------------------------
+Tue Apr  7 01:27:27 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.5.0-20140601
+  * /usr/sbin/tomoyo-editpolicy
+    Print "acl_group $N" correctly when using offline mode.
+- Changes from version 20140105
+  * /usr/lib/tomoyo/init_policy
+    Add path to systemd.
+  * /usr/sbin/tomoyo-queryd
+    Use poll() rather than select().
+- Changes from version 20130406
+  * Fix compile warning from clang.
+- Changes from version 20130214
+  * Change Makefile's build flags (fix bdo#674723)
+  * Change / to /* in rpm's %files section because Fedora 18 complains
+    conflicts.
+- Remove gpg verify requirement; obs handles it
+
 -------------------------------------------------------------------
 Tue Jan 29 12:28:35 UTC 2013 - meissner@suse.com
 
diff --git a/tomoyo-tools.keyring b/tomoyo-tools.keyring
index 238d7bc..d32b5ec 100644
--- a/tomoyo-tools.keyring
+++ b/tomoyo-tools.keyring
@@ -1,8 +1,76 @@
-pub   1024D/4B975A98 2008-07-29 [expires: 2013-07-29]
-uid                  Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
-
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+mQGiBFHikAQRBAC6MyO7E4kf9CAvaeu1oMB6WlTmI47smeDGeoFFnCmfYaodQKoE
+IioOgiKDZg18GiT+3IHVzeX37v/e0IeVhrAfX7ksnN740NwJNNiaSJu6UueQ3ngw
+v/oHaSJdIgEBvTA+dgZuj0AQL4acb27AQSv+x3MPmvxdQX7W3UJO9fiYMwCgmtmO
+a4/qOym3JZrbBbEveuuIVncD/AhNn/Nl2hr92vX9WzS+asgUOlNqGuaNVAuc5418
+UpDfe0w03756UkLxhPCnGoCCZbOUq531FvoFZSElV1HG0/lP2OGEdH3X2oxorVGd
+SG08l1MofRKenZOSnaKBKCSNoQr55b5okwr+eShuEmd3K/0uxHurfuw8aoeNwKQT
+ifFIBACrY+LYXR08vMUYdYZlsFtPdHl9nu9ri46U/s1m1iX0ytUnZTf4P8S7pu70
+hG9Scc8+cKCx3rLQEsSCeAs+gMwaRwHxLoiKr7Wg1LAfHeOde4tB11R/5YYvP/c4
+4Ff7QSDdetS5Fy8Lq/lHwOiqlbcTlMCrD5/g1fXepoj+CZ1UwbRxVGV0c3VvIEhh
+bmRhIChmb3Igb2xkZXIgdmVyc2lvbnMgb2YgUlBNIHdoaWNoIGNhbm5vdCBoYW5k
+bGUgNDA5NmJpdCBSU0Ega2V5KSA8cGVuZ3Vpbi1rZXJuZWxASS1sb3ZlLlNBS1VS
+QS5uZS5qcD6IaAQTEQIAKAUCUeKQBAIbAwUJCV4YgAYLCQgHAwIGFQgCCQoLBBYC
+AwECHgECF4AACgkQs3859v15c0eWbwCggVloUNaHxkrF02VYmzp/LN3dJ3sAoJJo
+DpMyNB4G441x+Tdgvi0+/brF
+=fT9Z
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+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
+6IVOUqTFSzgCM/LTjdpu6+Gqd7uEiKVkSQrveA==
+=IadO
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
 
 mQGiBEiPBxkRBACX0ru++8E6vHoVBupTgcEV/1Dk/Dv75AWNomyNJKUr8RaQ3LYs
 LmmEq0ZZSP6pnrba2tnw7dash1HFfqV6Kx0hUjU7gszNlI/tDepYsAexLJQNjVPU
diff --git a/tomoyo-tools.spec b/tomoyo-tools.spec
index 2f76dec..b71bd2f 100644
--- a/tomoyo-tools.spec
+++ b/tomoyo-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomoyo-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,19 @@
 #
 
 
-%define downloadver 2.5.0-20120805
-
-BuildRequires:  ncurses-devel
-
+%define downloadver 2.5.0-20140601
 Name:           tomoyo-tools
+Version:        2.5.0.20140601
+Release:        0
 Summary:        Userspace tools for TOMOYO Linux 2.4.x
 License:        GPL-2.0
 Group:          Development/Tools/Other
 Url:            http://sourceforge.jp/projects/tomoyo/
-Version:        2.5.0.20120805
-Release:        0
 Source0:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz
 Source1:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz.asc
-Source2:        %{name}.keyring
-BuildRequires:  gpg-offline
+# http://i-love.sakura.ne.jp/kumaneko-key
+Source2:        %name.keyring
+BuildRequires:  ncurses-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,14 +36,13 @@ This package contains userspace tools for administrating TOMOYO Linux 2.4.
 Please see http://tomoyo.sourceforge.jp/2.4/ for documentation.
 
 %prep
-%gpg_verify %{S:1}
 %setup -q -n %{name}
 
 %build
-make USRLIBDIR=%_libdir CFLAGS="-Wall $RPM_OPT_FLAGS"
+make %{?_smp_mflags} USRLIBDIR=%{_libdir} CFLAGS="-Wall %{optflags}"
 
 %install
-make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install
+make INSTALLDIR=%{buildroot} USRLIBDIR=%{_libdir} install
 
 %post -p /sbin/ldconfig
 
@@ -55,10 +52,10 @@ make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install
 %defattr(-, root, root)
 %doc COPYING.tomoyo README.tomoyo
 %attr(700,root,root) /sbin/tomoyo-init
-%_libdir/lib*.so*
-%dir %_libdir/tomoyo
-%_libdir/tomoyo/*
-/usr/sbin/*
-/usr/share/man/man8/*
+%{_libdir}/lib*.so*
+%dir %{_libdir}/tomoyo
+%{_libdir}/tomoyo/*
+%{_sbindir}/*
+%{_mandir}/man8/*
 
 %changelog