diff --git a/.gitignore b/.gitignore
index ac1dec2..001f6e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ commons-beanutils-1.8.3-src.tar.gz
 /commons-beanutils-1.9.1-src.tar.gz
 /commons-beanutils-1.9.2-src.tar.gz
 /commons-beanutils-1.9.3-src.tar.gz
+/commons-beanutils-1.9.4-src.tar.gz
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index c71f4ba..c351000 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -1,14 +1,11 @@
-%global base_name       beanutils
-%global short_name      commons-%{base_name}
-
-Name:           apache-%{short_name}
-Version:        1.9.3
-Release:        5%{?dist}
+Name:           apache-commons-beanutils
+Version:        1.9.4
+Release:        1%{?dist}
 Summary:        Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
 License:        ASL 2.0
-URL:            http://commons.apache.org/%{base_name}
+URL:            http://commons.apache.org/beanutils
 BuildArch:      noarch
-Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://archive.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(commons-collections:commons-collections)
@@ -29,7 +26,7 @@ Summary:        Javadoc for %{name}
 %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-beanutils-%{version}-src
 sed -i 's/\r//' *.txt
 
 %pom_remove_plugin :maven-assembly-plugin
@@ -37,7 +34,7 @@ sed -i 's/\r//' *.txt
 %mvn_alias :{*} :@1-core :@1-bean-collections
 %mvn_alias :{*} org.apache.commons:@1 org.apache.commons:@1-core org.apache.commons:@1-bean-collections
 %mvn_file : %{name} %{name}-core %{name}-bean-collections
-%mvn_file : %{short_name} %{short_name}-core %{short_name}-bean-collections
+%mvn_file : commons-beanutils commons-beanutils-core commons-beanutils-bean-collections
 
 %build
 # Some tests fail in Koji
@@ -54,6 +51,9 @@ sed -i 's/\r//' *.txt
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Thu Aug 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.4-1
+- Update to upstream version 1.9.4
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.3-5
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/sources b/sources
index f0a133e..bbd675e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (commons-beanutils-1.9.3-src.tar.gz) = 01cccfe7fca5fdf0d6cea83e4d1701ba9cfa40c6b5e516adc9e49998a3535db813b02bec724efeedfc2f8a774fcbb4ed9500eea56ab73f9002e081e090318ea2
+SHA512 (commons-beanutils-1.9.4-src.tar.gz) = 6f3d30d02b9a66cf20509bd868c6e2dadb44bb27da1e6b9af7275675e0f3826845a5d4005509dd1eb77a5b2937820c4770a3753daaab072785dcdab0caa69e73