diff --git a/xml-commons-apis-bootstrap.changes b/xml-commons-apis-bootstrap.changes
index 073d862..d29b8bc 100644
--- a/xml-commons-apis-bootstrap.changes
+++ b/xml-commons-apis-bootstrap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  1 12:14:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Speed-up build by compiling all *.java files in one javac
+  invocation
+
 -------------------------------------------------------------------
 Fri Dec  7 07:33:59 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/xml-commons-apis-bootstrap.spec b/xml-commons-apis-bootstrap.spec
index 9eac128..58168e7 100644
--- a/xml-commons-apis-bootstrap.spec
+++ b/xml-commons-apis-bootstrap.spec
@@ -2,7 +2,7 @@
 #
 # spec file for package xml-commons-apis-bootstrap
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -85,10 +85,7 @@ INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!!
 function delBinaryFiles() {
   set +x
   echo deleting binary files ...
-  for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"`
-  do
-    rm -rf $file
-  done
+  find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*" -delete
   set -x
 }
 #<<<
@@ -111,19 +108,15 @@ function mkTargetClasspath() {
 # uses LIB_GCJ for CLASSPATH
 function compileFiles() {
   COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH}
-  echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH \$file
-  for file in `find . -name "*.java"`
-  do
-    echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c"
-    $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file
-    # check for errors
-    if [ $? != 0 ]
-    then
-      echo ERROR
-      exit 1;
-    fi
-    echo done
-  done
+  echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs)"
+  $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs)
+  # check for errors
+  if [ $? != 0 ]
+  then
+    echo ERROR
+    exit 1;
+  fi
+  echo done
 }
 #<<<