diff --git a/Makefile b/Makefile
index 92f152c..8030ead 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,8 @@ endif
 
 	$(git_conf) alias.todo "grep -nH -E -i 'todo:|note:|fixme:'"
 
-	$(git_conf) alias.snap '! gitdir="`git rev-parse --git-dir`" && : >>"$$gitdir"/logs/refs/snapshot && cmt=`git stash create` && test -n "$$cmt" && git update-ref refs/snapshot $$cmt && echo Snapshot created: $$cmt'
+	$(git_conf) alias.stashsnap '! gitdir="`git rev-parse --git-dir`" && : >>"$$gitdir"/logs/refs/snapshot && cmt=`git stash create` && test -n "$$cmt" && git update-ref refs/snapshot $$cmt && echo Snapshot created: $$cmt'
+	$(git_conf) alias.snap '! gitdir="`git rev-parse --git-dir`" && export GIT_INDEX_FILE="$$gitdir"/snapshot.index && cp "$$gitdir"/index "$$GIT_INDEX_FILE" && git add -A && : >>"$$gitdir"/logs/refs/snapshot && git update-ref refs/snapshot $$(git commit-tree $$(git write-tree) -m Snapshot -p HEAD)'
 
 	#$(git_conf) alias.wc "!git ls-files -z | xargs -0 wc"
 	# $(git_conf) push.default "simple"