diff --git a/Completion/Zsh/Context/_math b/Completion/Zsh/Context/_math
new file mode 100644
index 000000000..278189ebe
--- /dev/null
+++ b/Completion/Zsh/Context/_math
@@ -0,0 +1,12 @@
+#compdef -math- let
+
+if [[ "$PREFIX" = *[^a-zA-Z0-9_]* ]]; then
+  IPREFIX="$IPREFIX${PREFIX%%[a-zA-Z0-9_]#}"
+  PREFIX="${PREFIX##*[^a-zA-Z0-9_]}"
+fi
+if [[ "$SUFFIX" = *[^a-zA-Z0-9_]* ]]; then
+  ISUFFIX="${SUFFIX##[a-zA-Z0-9_]#}$ISUFFIX"
+  SUFFIX="${SUFFIX%%[^a-zA-Z0-9_]*}"
+fi
+
+_parameters -g '(integer|float)*' || _parameters