diff --git a/.gitignore b/.gitignore
index 13ea633..2182066 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /v18.0.tar.xz
 /v18.0.tar.gz
 /v20.0.tar.gz
+/v24.0.tar.gz
diff --git a/guava.spec b/guava.spec
index ba9bb1e..9c34165 100644
--- a/guava.spec
+++ b/guava.spec
@@ -1,5 +1,5 @@
 Name:           guava
-Version:        20.0
+Version:        24.0
 Release:        1%{?dist}
 Summary:        Google Core Libraries for Java
 License:        ASL 2.0
@@ -10,10 +10,8 @@ Source0:        https://github.com/google/guava/archive/v%{version}.tar.gz
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
@@ -42,12 +40,15 @@ guava-testlib provides additional functionality for conveninent unit testing
 find . -name '*.jar' -delete
 
 %pom_disable_module guava-gwt
-%pom_remove_plugin -r :animal-sniffer-maven-plugin 
-%pom_remove_plugin :maven-gpg-plugin
-%pom_remove_dep jdk:srczip guava
+%pom_disable_module guava-tests
+
+%pom_remove_plugin -r :animal-sniffer-maven-plugin
+# Downloads JDK source for doc generation
+%pom_remove_plugin :maven-dependency-plugin guava
+
 %pom_remove_dep :caliper guava-tests
+
 %mvn_package :guava-parent guava
-%mvn_package :guava-tests __noinstall
 
 # javadoc generation fails due to strict doclint in JDK 1.8.0_45
 %pom_remove_plugin -r :maven-javadoc-plugin
@@ -57,10 +58,15 @@ find . -name '*.jar' -delete
 %pom_remove_dep -r :animal-sniffer-annotations
 %pom_remove_dep -r :error_prone_annotations
 %pom_remove_dep -r :j2objc-annotations
+%pom_remove_dep -r org.checkerframework:
 
 annotations=$(
-    fgrep -hr -e com.google.j2objc.annotations \
-        -e com.google.errorprone.annotation -e org.codehaus.mojo.animal_sniffer \
+    find -name '*.java' \
+    | xargs fgrep -h \
+        -e 'import com.google.j2objc.annotations' \
+        -e 'import com.google.errorprone.annotation' \
+        -e 'import org.codehaus.mojo.animal_sniffer' \
+        -e 'import org.checkerframework' \
     | sort -u \
     | sed 's/.*\.\([^.]*\);/\1/' \
     | paste -sd\|
@@ -68,12 +74,9 @@ annotations=$(
 # guava started using quite a few annotation libraries for code quality, which
 # we don't have. This ugly regex is supposed to remove their usage from the code
 find -name '*.java' | xargs sed -ri \
-    "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//'
+    "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
 
 %build
-
-%mvn_file :%{name} %{name}
-%mvn_alias :%{name} com.google.collections:google-collections com.google.guava:guava-jdk5
 # Tests fail on Koji due to insufficient memory,
 # see https://bugzilla.redhat.com/show_bug.cgi?id=1332971
 %mvn_build -s -f
@@ -91,6 +94,9 @@ find -name '*.java' | xargs sed -ri \
 %files testlib -f .mfiles-guava-testlib
 
 %changelog
+* Mon Feb 05 2018 Michael Simacek <msimacek@redhat.com> - 24.0-1
+- Update to upstream version 24.0
+
 * Mon Nov 06 2017 Michael Simacek <msimacek@redhat.com> - 20.0-1
 - Update to upstream version 20.0
 
diff --git a/sources b/sources
index 8da3b65..4246aea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v20.0.tar.gz) = 2adac0e4987cb531f67843bba94c52c610fbd30de72d6d80e7d446ec100393cebdc139ec6eb630c156778be9a5d464b8aa92534cb2a67a88a370858dc610ab64
+SHA512 (v24.0.tar.gz) = be20d28c2a0b54fe1c1b692367eb26e6f4f2cca80daf4e31f19beadb3c99741dc1fd801b068948b49488d91f2a2491fb1d88ae2f86831eafde4159cd36f3eb50