diff --git a/bouncycastle.changes b/bouncycastle.changes
index 606dbad..82baf39 100644
--- a/bouncycastle.changes
+++ b/bouncycastle.changes
@@ -2,6 +2,7 @@
 Tue Feb 10 12:29:43 UTC 2015 - tchvatal@suse.com
 
 - Version bump to 1.50 to match Fedora
+- Cleanup with spec-cleaner
 
 -------------------------------------------------------------------
 Mon Jul  7 14:57:54 UTC 2014 - tchvatal@suse.com
diff --git a/bouncycastle.spec b/bouncycastle.spec
index f2bdc8a..e6e4692 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -16,33 +16,31 @@
 #
 
 
-#
 %define ver  1.50
 %define shortver 150
 %define archivever jdk15on-%{shortver}
 %define classname org.bouncycastle.jce.provider.BouncyCastleProvider
-
-Summary:        Bouncy Castle Crypto Package for Java
-License:        MIT
-Group:          Development/Libraries/Java
 Name:           bouncycastle
 Version:        %{ver}
 Release:        0
+Summary:        Bouncy Castle Crypto Package for Java
+License:        MIT
+Group:          Development/Libraries/Java
 Url:            http://www.bouncycastle.org/
 Source0:        http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
 Source1:        http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{ver}/bcprov-jdk15on-%{ver}.pom
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  javapackages-tools
-Requires(post):   javapackages-tools
-Requires(postun): javapackages-tools
-BuildArch:      noarch
 BuildRequires:  java-devel
-BuildRequires:  unzip
+BuildRequires:  javapackages-tools
+BuildRequires:  junit
 #FIXME: this is needed for initialize of NSS crypto backend, will be required (not required(post) by openjdk)
 BuildRequires:  mozilla-nss
+BuildRequires:  unzip
 Requires:       java
-BuildRequires:  junit
+Requires(post): javapackages-tools
+Requires(postun): javapackages-tools
 Provides:       bcprov = %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
@@ -53,8 +51,8 @@ the additional infrastructure to conform the algorithms to the JCE framework.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description javadoc
 API documentation for the %{name} package.
@@ -120,7 +118,7 @@ popd
 {
   # Rebuild the list of security providers in classpath.security
   suffix=security/classpath.security
-  secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+  secfiles="%{_libexecdir}/$suffix %{_libdir}/$suffix"
 
   for secfile in $secfiles
   do
@@ -130,7 +128,7 @@ popd
     sed -i '/^security\.provider\./d' "$secfile"
 
     count=0
-    for provider in $(ls /etc/java/security/security.d)
+    for provider in $(ls %{_sysconfdir}/java/security/security.d)
     do
       count=$((count + 1))
       echo "security.provider.${count}=${provider#*-}" >> "$secfile"
@@ -144,7 +142,7 @@ if [ $1 -eq 0 ] ; then
   {
     # Rebuild the list of security providers in classpath.security
     suffix=security/classpath.security
-    secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
+    secfiles="%{_libexecdir}/$suffix %{_libdir}/$suffix"
 
     for secfile in $secfiles
     do
@@ -154,7 +152,7 @@ if [ $1 -eq 0 ] ; then
       sed -i '/^security\.provider\./d' "$secfile"
 
       count=0
-      for provider in $(ls /etc/java/security/security.d)
+      for provider in $(ls %{_sysconfdir}/java/security/security.d)
       do
         count=$((count + 1))
         echo "security.provider.${count}=${provider#*-}" >> "$secfile"