diff --git a/.gitignore b/.gitignore
index be41408..029b54d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mstrobel-procyon-ee404caa9a29.zip
 /v0.5.36.tar.gz
 /procyon-1.0~SNAPSHOT.tar.gz
+/procyon-92ba3f44b8f2b755a21efcdc05dec347ab4df552.tar.gz
diff --git a/generate-tarball.sh b/generate-tarball.sh
index 0ec644d..817fc26 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
-set -e
+set -ex
 
 name=procyon
-version="$(sed -n 's/Version:\s*//p' *.spec)"
+version=`cat procyon.spec | grep "%global commit " | sed "s/.*commit //"`
 
 # RETRIEVE
 rm -rf procyon
-git clone "https://github.com/slowcoders/procyon.git"
+git clone "https://github.com/mstrobel/procyon.git"
 
 # CLEAN TARBALL
 pushd procyon
-git checkout "f6568b3ffbb61af8166f678190f2dc0775fd47fd"
+git checkout "$version"
 
 rm -rf .git .idea docs
 rm -rf gradle*
diff --git a/procyon.spec b/procyon.spec
index ebfc528..0e13ace 100644
--- a/procyon.spec
+++ b/procyon.spec
@@ -2,15 +2,19 @@
 %define debug_package %{nil}
 %global remove_tests 1
 
+%global commit 92ba3f44b8f2b755a21efcdc05dec347ab4df552
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20210619
+
 Name:       procyon
-Version:    1.0~SNAPSHOT
-Release:    1%{?dist}
+Version:    0.5.36
+Release:    0.6.%{commitdate}.git%{shortcommit}%{?dist}
 Summary:    procyon java decompiler and other tools
 License:    ASL 2.0 
 URL:        https://github.com/mstrobel/procyon
 # ./generate-tarball.sh
 # This script uses a fork of the original project
-Source0:    %{name}-%{version}.tar.gz
+Source0:    %{name}-%{commit}.tar.gz
 Source1:    procyon-decompiler
 
 # main removal is not upstream-able, and is enforced by fedora policy
@@ -107,7 +111,7 @@ limited and cumbersome support for generic type inspection. Its code generation
 MethodBuilder, and a bytecode emitter.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
 %if %{remove_tests}
 find | grep "\\.class$"
 #find | grep "\\.jar$"
@@ -217,6 +221,9 @@ popd
 %doc README.md
 
 %changelog
+* Thu Jun 03 2020 Jiri Vanek <jvanek@redhat.com> - 0.5.36-0.6-92ba3f4
+- moved to commit versioning
+
 * Thu Jun 03 2021 Marian Koncek <mkoncek@redhat.com> - 1.0~SNAPSHOT-1
 - Update to upstream version 1.0~SNAPSHOT
 
diff --git a/sources b/sources
index d5cb14e..4a20307 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (procyon-1.0~SNAPSHOT.tar.gz) = d19f5fc282facf0756a363844c38e98ea33d8488fd512b33a63057371e8ed31358ff47cb44b273a3687b09588342f25258a168ffba436380bd22d25b85ca3b07
+SHA512 (procyon-92ba3f44b8f2b755a21efcdc05dec347ab4df552.tar.gz) = eca4fd9c7b3b4b09e4bcf7e317ca3988301899b2a784fe4b789cb5797934a849f63a9ec330a05a6c4232660c6e2878cfd242e756f0131575df72404cec573b68