diff --git a/.gitignore b/.gitignore
index 0acaa3f..0c87142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,4 @@
 /5.3.0.tar.gz
 /5.3.1.tar.gz
 /6.0.0~alpha.tar.gz
+/6.0.0.tar.gz
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 3e8f295..f5e8b22 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,10 +1,6 @@
 %bcond_with bootstrap
 
-%if 0%{?fedora}
-%bcond_without ivy
-%else
 %bcond_with ivy
-%endif
 
 # Don't generate requires on jpackage-utils and java-headless for
 # provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
@@ -17,16 +13,14 @@
 %global default_jre %{_prefix}/lib/jvm/jre-11-openjdk
 
 Name:           javapackages-tools
-Version:        6.0.0~alpha
-Release:        9%{?dist}
+Version:        6.0.0
+Release:        1%{?dist}
 Summary:        Macros and scripts for Java packaging support
 License:        BSD
 URL:            https://github.com/fedora-java/javapackages
 BuildArch:      noarch
 
-# git archive --prefix javapackages-6.0.0~alpha/ HEAD | gzip -9nc >6.0.0~alpha.tar.gz
-Source0:        %{version}.tar.gz
-#Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
+Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
 Source2:        toolchains-openjdk8.xml
 Source3:        javapackages-config.json
 
@@ -193,6 +187,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 %license LICENSE
 
 %changelog
+* Mon Jul 26 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0-1
+- Update to upstream version 6.0.0
+
 * Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.0.0~alpha-9
 - Rebuild to workaround DistroBaker issue
 
diff --git a/sources b/sources
index 19a67e4..db19343 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (6.0.0~alpha.tar.gz) = 1af48a06d4c29e004fded8c11c817c840a321710b76f2393020ac9fd48ddbf688539623cb784ab64874d7a5cc1320d757b18b31aa4c6e383dc4260de2e6572e3
+SHA512 (6.0.0.tar.gz) = 2402aac750b8f9aa9789e2e7cf823a3aac626f6cc46717797f8b47ee1fab6fe340dc17034c8880b0161f65d053aa75c671ba9c18f0d9626b75a191d5e2d3cea4