diff --git a/beakerlib.spec b/beakerlib.spec
index b99a69f..2a873dd 100644
--- a/beakerlib.spec
+++ b/beakerlib.spec
@@ -1,7 +1,7 @@
 Name:       beakerlib
 Summary:    A shell-level integration testing library
 Version:    1.18
-Release:    5%{?dist}
+Release:    6%{?dist}
 License:    GPLv2
 Group:      Development/Libraries
 BuildArch:  noarch
@@ -91,7 +91,7 @@ Files for syntax highlighting BeakerLib tests in VIM editor
 %{_datadir}/vim/vimfiles/after/syntax/beakerlib.vim
 
 %changelog
-* Mon Jun 3 2019 Dalibor Pospisil <dapospis@redhat.com> - 1.18-5
+* Mon Jun 3 2019 Dalibor Pospisil <dapospis@redhat.com> - 1.18-6
 - fixed correct python checking, bz1715479
 - fix unbound variables, issues #43
 - fixed path to services state store
diff --git a/fix-unbound-variables.patch b/fix-unbound-variables.patch
index 50a87b5..fa50001 100644
--- a/fix-unbound-variables.patch
+++ b/fix-unbound-variables.patch
@@ -1,32 +1,50 @@
-From 1ee8383ff6108273a0bd726e8ccddbdaa43956b9 Mon Sep 17 00:00:00 2001
+From 57ad9345c5fb4d893de7a969c7a83826c4476a93 Mon Sep 17 00:00:00 2001
 From: Dalibor Pospisil <dapospis@redhat.com>
 Date: Mon, 3 Jun 2019 16:39:42 +0200
-Subject: [PATCH 7/8] fix unbound variables
+Subject: [PATCH] fix unbound variables
 
 ---
- src/beakerlib.sh | 2 ++
- 1 file changed, 2 insertions(+)
+ src/beakerlib.sh | 6 ++++++
+ src/rpms.sh      | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/beakerlib.sh b/src/beakerlib.sh
-index c123e3d..2c27c10 100644
+index c123e3d..de54a63 100644
 --- a/src/beakerlib.sh
 +++ b/src/beakerlib.sh
 @@ -31,6 +31,7 @@
  #   Boston, MA 02110-1301, USA.
  #
  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-+__INTERNAL_SOURCED=${__INTERNAL_SOURCED:-""}
++__INTERNAL_SOURCED=${__INTERNAL_SOURCED-}
  echo "${__INTERNAL_SOURCED}" | grep -qF -- " ${BASH_SOURCE} " && return || __INTERNAL_SOURCED+=" ${BASH_SOURCE} "
  
  : <<'=cut'
-@@ -410,6 +411,7 @@ export __INTERNAL_PERSISTENT_TMP=/var/tmp
+@@ -410,6 +411,11 @@ export __INTERNAL_PERSISTENT_TMP=/var/tmp
  test -f /etc/profile.d/cobbler.sh && . /etc/profile.d/cobbler.sh
  
  set -e
-+BEAKERLIB_DIR=${BEAKERLIB_DIR:=""}
++BEAKERLIB_DIR=${BEAKERLIB_DIR-}
++TESTID=${TESTID-}
++JOBID=${JOBID-}
++RECIPEID=${RECIPEID-}
++BEAKERLIB_JOURNAL=${BEAKERLIB_JOURNAL-}
  export BEAKERLIB=${BEAKERLIB:-"/usr/share/beakerlib"}
  . $BEAKERLIB/storage.sh
  . $BEAKERLIB/infrastructure.sh
+diff --git a/src/rpms.sh b/src/rpms.sh
+index 144275c..3b55473 100644
+--- a/src/rpms.sh
++++ b/src/rpms.sh
+@@ -533,7 +533,7 @@ rlAssertRequired(){
+ }
+ 
+ 
+-: <<=cut
++: <<'=cut'
+ =pod
+ 
+ =head2 Getting RPMs
 -- 
 2.21.0