diff --git a/guava.changes b/guava.changes
new file mode 100644
index 0000000..b605275
--- /dev/null
+++ b/guava.changes
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------
+Fri Apr 12 10:05:01 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of guava 25.0
diff --git a/guava.spec b/guava.spec
index 8e90f3f..fc8f675 100644
--- a/guava.spec
+++ b/guava.spec
@@ -20,9 +20,7 @@ Name:           guava
 Version:        25.0
 Release:        0
 Summary:        Google Core Libraries for Java
-# Most of the code is under ASL 2.0
-# Few classes are under CC0, grep for creativecommons
-License:        Apache-2.0 AND CC0
+License:        Apache-2.0 AND CC0-1.0
 Group:          Development/Libraries/Java
 URL:            https://github.com/google/guava
 Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz
@@ -36,7 +34,7 @@ BuildArch:      noarch
 
 %description
 Guava is a suite of core and expanded libraries that include
-utility classes, Google’s collections, io classes, and much
+utility classes, Google's collections, io classes, and much
 much more.
 This project is a complete packaging of all the Guava libraries
 into a single jar.  Individual portions of Guava can be used
@@ -44,7 +42,6 @@ by downloading the appropriate module and its dependencies.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
 Group:          Documentation/HTML
 
 %description javadoc
@@ -96,8 +93,6 @@ find -name '*.java' | xargs sed -ri \
     "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
 
 %build
-# Tests fail on Koji due to insufficient memory,
-# see https://bugzilla.redhat.com/show_bug.cgi?id=1332971
 %{mvn_build} -s -f -- -Dsource=1.8
 
 %install