diff --git a/lazarus.spec b/lazarus.spec
index 5578b76..8e4057e 100644
--- a/lazarus.spec
+++ b/lazarus.spec
@@ -1,6 +1,6 @@
 Name:           lazarus
 Version:        1.8.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Lazarus Component Library and IDE for Freepascal
 
 # GNU Classpath style exception, see COPYING.modifiedLGPL
@@ -11,7 +11,12 @@ patch0:         Makefile_patch.diff
 patch1:         Desktop_patch.diff
 patch2:         disable_pascalscript_powerpc64.diff
 
-BuildRequires:  fpc, binutils, glibc-devel, desktop-file-utils, fpc-src, gtk2-devel
+BuildRequires:  binutils
+BuildRequires:  desktop-file-utils
+BuildRequires:  fpc, fpc-src
+BuildRequires:  gcc-c++
+BuildRequires:  glibc-devel
+BuildRequires:  gtk2-devel
 BuildRequires:  perl-generators
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtx11extras-devel
@@ -26,7 +31,7 @@ Component Library - LCL, which is also included in this package.
 # Qt5pas start
 # The version is taken from lcl/interfaces/qt5/cbindings/Qt5Pas.pro
 %global qt5pas_version 2.6
-%global qt5pas_release 4
+%global qt5pas_release %(relstr="%{version}.%{release}"; relstr=(${relstr//./ }); ((relno=${relstr[0]}*1000000 + ${relstr[1]}*10000 + ${relstr[2]}*100 + ${relstr[3]})); echo "${relno}%{?dist}";)
 
 %package -n     qt5pas
 Version:        %{qt5pas_version}
@@ -135,6 +140,10 @@ fi
 
 
 %changelog
+* Sat Nov 17 2018 Artur Iwicki <fedora@svgames.pl> - 1.8.4-2
+- Use Lazarus version number to auto-calculate the qt5pas release number
+  This should prevent build failures in koji due to duplicate qt5pas version-release tags.
+
 * Sat Aug 18 2018 Artur Iwicki <fedora@svgames.pl> - 1.8.4-1
 - Update to new upstream version