diff --git a/Makefile b/Makefile
index 7fe336880b34ebd8e189b7db827ec2caff98d246..fbf773560e3b6fcc40c9fec54b07d658a1705326 100644
--- a/Makefile
+++ b/Makefile
@@ -128,9 +128,9 @@ endif
 include src/arch/${arch}/Makefile.inc
 
 stack: default
-	@test -n "${OBJDUMP}"
-	@test -n "${ARCH_CALL_COST}"
-	@./avstack.pl ${OBJDUMP} ${ARCH_CALL_COST} ${OBJECTS}
+	${QUIET}test -n "${OBJDUMP}"
+	${QUIET}test -n "${ARCH_SHORTNAME}"
+	${QUIET}./static-stack-analyze.pl ${OBJDUMP} ${ARCH_SHORTNAME} ${OBJECTS}
 
 clean: arch_clean
 	rm -f build/system.elf
diff --git a/src/arch/arduino-nano-168/Makefile.inc b/src/arch/arduino-nano-168/Makefile.inc
index 4330d979b147fac5623ec65762bf34fb80349184..17b76e294777f0a8b1ede7731e8f6551b49e462f 100644
--- a/src/arch/arduino-nano-168/Makefile.inc
+++ b/src/arch/arduino-nano-168/Makefile.inc
@@ -21,8 +21,7 @@ NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 
-# On each function call, the 2-Byte return address is pushed onto the stack
-ARCH_CALL_COST = 2
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/arduino-nano/Makefile.inc b/src/arch/arduino-nano/Makefile.inc
index 28bbead52e2802838e9ce69dfec80b89e2afc924..7933ef2f58d190c341bf2b33d8b2bd9a915e60a8 100644
--- a/src/arch/arduino-nano/Makefile.inc
+++ b/src/arch/arduino-nano/Makefile.inc
@@ -21,8 +21,7 @@ NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
 
-# On each function call, the 2-Byte return address is pushed onto the stack
-ARCH_CALL_COST = 2
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/blinkenrocket/Makefile.inc b/src/arch/blinkenrocket/Makefile.inc
index f2a4d68346b00f454d372ac4e2d55b55c8a5c9cc..b123e32cc2976cd25cf4d78083f049b9c992ccda 100644
--- a/src/arch/blinkenrocket/Makefile.inc
+++ b/src/arch/blinkenrocket/Makefile.inc
@@ -12,7 +12,8 @@ CXX = avr-g++
 NM = avr-nm
 OBJCOPY = avr-objcopy
 OBJDUMP = avr-objdump
-ARCH_CALL_COST = 4
+
+ARCH_SHORTNAME = avr
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 --c_compiler avr-g++ -p . --Xcompiler
diff --git a/src/arch/msp430fr5969lp/Makefile.inc b/src/arch/msp430fr5969lp/Makefile.inc
index b2c0231500e008280f0477ebbc889f90f6fcf60a..1ea1c0586714d10a68c0e4c06ae4be3d24ea44ae 100644
--- a/src/arch/msp430fr5969lp/Makefile.inc
+++ b/src/arch/msp430fr5969lp/Makefile.inc
@@ -16,9 +16,7 @@ CXX = /opt/msp430/ti/gcc/bin/msp430-elf-g++
 OBJCOPY = /opt/msp430/ti/gcc/bin/msp430-elf-objcopy
 OBJDUMP = /opt/msp430/ti/gcc/bin/msp430-elf-objdump
 
-# For each function call, the 4-Byte (20 bits at 2-Byte alignment) return
-# address is pushed onto the stack.
-ARCH_CALL_COST = 4
+ARCH_SHORTNAME = msp430
 
 CXX_TARGETS += src/arch/msp430fr5969lp/arch.cc
 
diff --git a/src/arch/posix/Makefile.inc b/src/arch/posix/Makefile.inc
index e901aeb8ffa5ff69a24a1c1c532d73323ec7da82..ec34626e03679acb9690735421fc9a0d8f1a10bc 100644
--- a/src/arch/posix/Makefile.inc
+++ b/src/arch/posix/Makefile.inc
@@ -6,8 +6,7 @@ CC = gcc
 CXX = g++
 OBJDUMP = objdump
 
-# For each function call, the 8-Byte return address is pushed onto the stack.
-ARCH_CALL_COST = 8
+ARCH_SHORTNAME = x64
 
 ifeq (${aspectc}, 1)
 	CXX = ag++ -r build/repo.acp -v 0 -p . --Xcompiler