diff --git a/bsh.spec b/bsh.spec
index 7fb79f4..3faacf0 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -28,11 +28,11 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%global reltag b6
+%global upstream_version %(echo %{version} | tr -d '~')
 
 Name:           bsh
-Version:        2.0
-Release:        14.%{reltag}%{?dist}
+Version:        2.0~b6
+Release:        1%{?dist}
 Summary:        Lightweight Scripting for Java
 URL:            http://www.beanshell.org/
 # bundled asm is BSD
@@ -40,7 +40,9 @@ URL:            http://www.beanshell.org/
 License:        ASL 2.0 and BSD and Public Domain
 BuildArch:      noarch
 # ./generate-tarball.sh
-Source0:        %{name}-%{version}-%{reltag}.tar.gz
+# TODO Use proper %%{version} when a newer version is available
+# TODO Also see TODO in ./generate-tarball.sh
+Source0:        %{name}-2.0-b6.tar.gz
 Source1:        %{name}-desktop.desktop
 # Remove bundled jars which cannot be easily verified for licensing
 # Remove code marked as SUN PROPRIETARY/CONFIDENTAIL
@@ -100,7 +102,7 @@ Summary:        API documentation for %{name}
 This package provides %{summary}.
 
 %prep
-%setup -q -n beanshell-%{version}%{reltag}
+%setup -q -n beanshell-%{upstream_version}
 
 sed -i 's,org.apache.xalan.xslt.extensions.Redirect,http://xml.apache.org/xalan/redirect,' docs/manual/xsl/*.xsl
 
@@ -115,11 +117,10 @@ build-jar-repository lib bsf javacc junit glassfish-servlet-api
 ant test dist
 
 %install
-%mvn_artifact pom.xml dist/%{name}-%{version}%{reltag}.jar
+%mvn_artifact pom.xml dist/%{name}-%{upstream_version}.jar
 
 %mvn_install -J javadoc
 
-
 install -d -m 755 %{buildroot}%{_datadir}/%{name}
 install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps
 install -m 644 dist/bshservlet.war %{buildroot}%{_datadir}/%{name}/webapps
@@ -150,6 +151,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
 %license LICENSE NOTICE
 
 %changelog
+* Mon Sep 16 2019 Marian Koncek <mkoncek@redhat.com> - 2.0~b6-1
+- Use tilde versioning
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0-14.b6
 - Mass rebuild for javapackages-tools 201901
 
diff --git a/generate-tarball.sh b/generate-tarball.sh
index bf091f9..49ea030 100755
--- a/generate-tarball.sh
+++ b/generate-tarball.sh
@@ -3,15 +3,14 @@ set -e
 
 name=bsh
 version="$(sed -n 's/Version:\s*//p' *.spec)"
-reltag="$(sed -n 's/%global\s*reltag\s*//p' *.spec)"
 
 # RETRIEVE
-wget "https://github.com/beanshell/beanshell/archive/${version}${reltag}.tar.gz" -O "${name}-${version}-${reltag}.orig.tar.gz"
+wget "https://github.com/beanshell/beanshell/archive/${version/'~'}.tar.gz" -O "${name}-${version}.orig.tar.gz"
 
 rm -rf tarball-tmp
 mkdir tarball-tmp
 cd tarball-tmp
-tar xf "../${name}-${version}-${reltag}.orig.tar.gz"
+tar xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
 rm -r */lib
@@ -20,6 +19,7 @@ find -name '*.class' -delete
 # Files marked as SUN PROPRIETARY/CONFIDENTAIL
 rm -r */engine/javax-src
 
-tar cf "../${name}-${version}-${reltag}.tar.gz" *
+# TODO Simply use ${version} without substitution when a newer version is available
+tar cf "../${name}-${version/'~'/'-'}.tar.gz" *
 cd ..
-rm -r tarball-tmp "${name}-${version}-${reltag}.orig.tar.gz"
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"