diff --git a/.gitignore b/.gitignore
index 9e1cc61..0825c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /auto-value-1.1.tar.gz
 /auto-value-1.3.tar.gz
 /auto-value-1.4.1.tar.gz
+/auto-value-1.5.4.tar.gz
diff --git a/auto.spec b/auto.spec
index 72ab2ee..d04db8b 100644
--- a/auto.spec
+++ b/auto.spec
@@ -1,83 +1,91 @@
-Name:          auto
-Version:       1.4.1
-Release:       2%{?dist}
-Summary:       A collection of source code generators for Java
-License:       ASL 2.0
-URL:           https://github.com/google/auto
-Source0:       https://github.com/google/auto/archive/auto-value-%{version}.tar.gz
+Name:           auto
+Summary:        Collection of source code generators for Java
+Version:        1.5.4
+Release:        1%{?dist}
+License:        ASL 2.0
+
+URL:            https://github.com/google/auto
+# Source tarball is generated by script to ensure the correct tagged
+# code is fetched for the various submodules
+Source0:        auto-value-%{version}.tar.gz
+Source1:        gen_auto_tarball.sh
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.guava:guava:19.0)
+BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(com.squareup:javapoet)
-BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
 
-BuildArch:     noarch
+BuildArch:      noarch
 
 %description
 The Auto sub-projects are a collection of code generators
 that automate those types of tasks.
 
+
 %package common
-Summary:       Auto Common Utilities
+Summary:        Auto Common Utilities
 # Obsoletes added in F30
-Obsoletes:     %{name}-factory < %{version}-%{release}
+Obsoletes:      %{name}-factory < %{version}-%{release}
 
 %description common
 Common utilities for creating annotation processors.
 
+
 %package service
-Summary:       Provider-configuration files for ServiceLoader
+Summary:        Provider-configuration files for ServiceLoader
 
 %description service
 A configuration/meta-data generator for
 java.util.ServiceLoader-style service
 providers.
 
+
 %package value
-Summary:       Auto Value
+Summary:        Auto Value
 
 %description value
 Immutable value-type code generation for Java 1.6+.
 
+
 %package javadoc
-Summary:       Javadoc for %{name}
+Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains javadoc for %{name}.
 
+
 %prep
-%setup -q -n auto-auto-value-%{version}
+%setup -q -n auto-value-%{version}
 find -name '*.class' -print -delete
 find -name '*.jar' -print -delete
 
+# remove unnecessary dependency on parent POM
+%pom_remove_parent
+
 # Disable factory module due to missing dep:
 # com.google.googlejavaformat:google-java-format
 %pom_disable_module factory build-pom.xml
 
-%pom_xpath_set "pom:project/pom:version" 3
-for p in common factory service value ;do
-%pom_xpath_set "pom:project/pom:version" %{version} ${p}
-%pom_xpath_remove "pom:dependency[pom:scope = 'test']" ${p}
-done
+# Fix deps in service module
+%pom_xpath_set "pom:parent/pom:version" 6 service
+%pom_change_dep com.google.auto:auto-common com.google.auto:auto-common:0.10 service
 
 %pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
 %pom_remove_plugin :maven-shade-plugin value
 %pom_remove_plugin :maven-invoker-plugin value
-%pom_remove_plugin :maven-invoker-plugin factory
-
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-common']/pom:version" %{version} factory service value
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-service']/pom:version" %{version} factory value
-%pom_xpath_set "pom:dependency[pom:artifactId = 'auto-value']/pom:version" %{version} factory
 
 %mvn_package :build-only __noinstall
 
+
 %build
-# Unavailable test deps
+# skip test suite because of unpackaged dependencies for tests
 %mvn_build -sf -- -f build-pom.xml
 
+
 %install
 %mvn_install
 
+
 %files -f .mfiles-%{name}-parent
 %dir %{_javadir}/%{name}
 %doc README.md
@@ -98,7 +106,12 @@ done
 %files javadoc -f .mfiles-javadoc
 %license LICENSE.txt
 
+
 %changelog
+* Fri Dec 13 2019 Fabio Valentini <decathorpe@gmail.com> - 1.5.4-1
+- Update to version 1.5.4
+- Don't use compat version of guava any longer
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
@@ -141,3 +154,4 @@ done
 
 * Tue Mar 31 2015 gil cattaneo <puntogil@libero.it> 1.0-1
 - initial rpm
+
diff --git a/gen_auto_tarball.sh b/gen_auto_tarball.sh
new file mode 100755
index 0000000..be2911f
--- /dev/null
+++ b/gen_auto_tarball.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+VAL_TAG=auto-value-1.5.4
+COM_TAG=auto-common-0.10
+SER_TAG=auto-service-1.0-rc4
+PARENT_TAG=auto-parent-6
+
+mkdir $VAL_TAG/
+pushd $VAL_TAG/
+wget https://github.com/google/auto/archive/$VAL_TAG.tar.gz
+tar xvf $VAL_TAG.tar.gz --strip-components=1
+rm -rf pom.xml factory/ common/ service/
+wget https://github.com/google/auto/archive/$COM_TAG.tar.gz
+tar xvf $COM_TAG.tar.gz --strip-components=1 auto-$COM_TAG/common
+wget https://github.com/google/auto/archive/$SER_TAG.tar.gz
+tar xvf $SER_TAG.tar.gz --strip-components=1 auto-$SER_TAG/service
+wget https://github.com/google/auto/archive/$PARENT_TAG.tar.gz
+tar xvf $PARENT_TAG.tar.gz --strip-components=1 auto-$PARENT_TAG/pom.xml
+rm *.tar.gz
+popd
+
+tar caf $VAL_TAG.tar.gz $VAL_TAG/
+rm -rf $VAL_TAG/
+
diff --git a/sources b/sources
index 689f2ba..ccb80a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (auto-value-1.4.1.tar.gz) = 933add2e824c5ae241d1d4d4b5c6d9b953e9a51a97d02812b159402c14222e5f097eb83fdedfb1ece2e36750a0fa86f0e696af76321baee711ca19f46caee1da
+SHA512 (auto-value-1.5.4.tar.gz) = eac782de9e32d516cec2e16d567b19ad663218334ffcd43113b7fd5d6f15fdd8289f8337b14ea4222057bbd6ced2c20fd22f182b7c17861058c2febe2cf601b8