diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index b164d31..b58fd57 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -1,14 +1,14 @@
 %global short_name   jcommander
 
 Name:             beust-%{short_name}
-Version:          1.56
+Version:          1.57
 Release:          1%{?dist}
 Summary:          Java framework for parsing command line parameters
 License:          ASL 2.0
 URL:              http://jcommander.org/
 BuildArch:        noarch
 
-Source0:          https://github.com/cbeust/%{short_name}/archive/%{short_name}-%{version}.tar.gz
+Source0:          https://github.com/cbeust/%{short_name}/archive/%{version}.tar.gz
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.beust:jcommander)
@@ -28,7 +28,7 @@ Summary:          API documentation for %{name}
 This package contains the %{summary}.
 
 %prep
-%setup -q -n %{short_name}-%{short_name}-%{version}
+%setup -q -n %{short_name}-%{version}
 chmod -x license.txt
 
 %build
@@ -45,6 +45,11 @@ chmod -x license.txt
 %doc license.txt notice.md
 
 %changelog
+* Fri Sep 30 2016 Roman Vais <rvais@redhat.com> - 1.57-1
+- Update to upstream version 1.57
+- Correct directory setup in prep section
+- Change of tarball name in source url to correspond to upstream
+
 * Tue Sep 27 2016 Roman Vais <rvais@redhat.com> - 1.56-1
 - New version release.