diff --git a/regexp.changes b/regexp.changes
index f3ba5fb..08644d5 100644
--- a/regexp.changes
+++ b/regexp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri May 19 11:22:28 UTC 2017 - dziolkowski@suse.com
+
+- New build dependency: javapackages-local
+- spec cleaned using spec-cleaner
+
 -------------------------------------------------------------------
 Wed Mar 18 09:46:19 UTC 2015 - tchvatal@suse.com
 
diff --git a/regexp.spec b/regexp.spec
index 1fe0533..6098013 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -1,9 +1,8 @@
 #
 # spec file for package regexp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,12 +15,10 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 %define full_name       jakarta-%{name}
 %define section         free
-
 Name:           regexp
 Version:        1.5
 Release:        0
@@ -31,19 +28,16 @@ Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/%{name}/
 Source0:        http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
 Source1:        regexp-%{version}.pom
-BuildRequires:  javapackages-tools
-Requires(pre):     javapackages-tools
-Requires(postun):  javapackages-tools
+BuildRequires:  ant
 BuildRequires:  ant >= 1.6
 BuildRequires:  java-1_5_0-gcj-compat-devel
+BuildRequires:  javapackages-local
+BuildRequires:  javapackages-tools
 BuildRequires:  xml-commons-apis-bootstrap
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  xml-commons-apis xml-commons-resolver xml-commons xerces-j2
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  ant
-BuildRequires:  java-1_5_0-gcj-compat-devel
-BuildRequires:  xml-commons-apis-bootstrap
 
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
@@ -66,13 +60,13 @@ ant -Djakarta-site2.dir=. jar
 
 %install
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 [ -d docs/api ] && rm -rf docs/api
 # pom
-%{__mkdir_p} %{buildroot}%{_mavenpomdir}
-%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files