diff --git a/carl9170fw/autogen.sh b/carl9170fw/autogen.sh
index 6843f196..843209c5 100755
--- a/carl9170fw/autogen.sh
+++ b/carl9170fw/autogen.sh
@@ -23,6 +23,7 @@ case "$1" in
 			exit 1
 		fi
 
+		# shellcheck source=/dev/null
 		. ./.config
 		make
 
@@ -34,7 +35,7 @@ case "$1" in
 		fi
 
 		install -m 644 carlfw/carl9170.fw \
-			../carl9170-$CONFIG_CARL9170FW_RELEASE_VERSION.fw
+			../carl9170-"$CONFIG_CARL9170FW_RELEASE_VERSION".fw
 		echo "done."
 	;;
 
diff --git a/carl9170fw/genapi.sh b/carl9170fw/genapi.sh
index 8912cc66..ae9f330d 100755
--- a/carl9170fw/genapi.sh
+++ b/carl9170fw/genapi.sh
@@ -3,9 +3,9 @@
 cat <<EOF > include/shared/version.h
 #ifndef __CARL9170_SHARED_VERSION_H
 #define __CARL9170_SHARED_VERSION_H
-#define CARL9170FW_VERSION_YEAR $((100`date +%Y`%100))
-#define CARL9170FW_VERSION_MONTH $((100`date +%m`%100))
-#define CARL9170FW_VERSION_DAY $((100`date +%d`%100))
-#define CARL9170FW_VERSION_GIT "`git describe 2>/dev/null`"
+#define CARL9170FW_VERSION_YEAR $((100$(date +%Y)%100))
+#define CARL9170FW_VERSION_MONTH $((100$(date +%m)%100))
+#define CARL9170FW_VERSION_DAY $((100$(date +%d)%100))
+#define CARL9170FW_VERSION_GIT $(git describe 2>/dev/null)
 #endif /* __CARL9170_SHARED_VERSION_H */
 EOF