diff --git a/autogen.sh b/autogen.sh
index adc457ea5..f052499ae 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env bash
 
 set -e
 
diff --git a/gentpl.py b/gentpl.py
index 5b7987390..17bda02c6 100644
--- a/gentpl.py
+++ b/gentpl.py
@@ -105,7 +105,7 @@ def var_add(var, value):
 # Autogen constructs
 #
 
-def set_canonical_name_suffix(suffix): return "[+ % name `export cname=$(echo -n %s" + suffix + " | sed -e 's/[^0-9A-Za-z@_]/_/g')` +]"
+def set_canonical_name_suffix(suffix): return "[+ % name `export cname=$(echo %s" + suffix + " | sed -e 's/[^0-9A-Za-z@_]/_/g')` +]"
 def cname(): return "[+ % name `echo $cname` +]"
 
 def rule(target, source, cmd):