diff --git a/xml-commons-apis.changes b/xml-commons-apis.changes
index cc86601..505dddf 100644
--- a/xml-commons-apis.changes
+++ b/xml-commons-apis.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 11 01:18:50 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Fix RPM groups. Use improved file deletion.
+
 -------------------------------------------------------------------
 Thu Dec  6 10:43:20 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/xml-commons-apis.spec b/xml-commons-apis.spec
index 8f615c3..5d10981 100644
--- a/xml-commons-apis.spec
+++ b/xml-commons-apis.spec
@@ -55,14 +55,14 @@ includes the DOM, SAX, and JAXP.
 
 %package manual
 Summary:        Manual for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description manual
 %{summary}.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description javadoc
 %{summary}.
@@ -70,8 +70,7 @@ Group:          Development/Libraries/Java
 %prep
 %setup -q -n external
 # Make sure upstream hasn't sneaked in any jars we don't know about
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
+find "(" -name "*.class" -o -name "*.jar" ")" -delete
 
 # Fix file encodings
 iconv -f iso8859-1 -t utf-8 LICENSE.dom-documentation.txt > \