diff --git a/qubeize_image b/qubeize_image
index 386ff57..d3b81cf 100755
--- a/qubeize_image
+++ b/qubeize_image
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
     set -x
diff --git a/templates.spec b/templates.spec
index 1ad6fd4..55075d0 100644
--- a/templates.spec
+++ b/templates.spec
@@ -33,11 +33,9 @@ Obsoletes:  %{name} > %{version}-%{release}
 Qubes template for %{template_name}
 
 %build
-pushd qubeized_images/%{template_name}
+cd qubeized_images/%{template_name}
 rm -f root.img.part.*
 tar --sparse --dereference -cf - root.img | split -d -b 1G - root.img.part.
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT