diff --git a/contrib/Tupfile b/contrib/Tupfile
index c8c97d4e..1f2f3e8d 100644
--- a/contrib/Tupfile
+++ b/contrib/Tupfile
@@ -58,6 +58,8 @@ endif
 
 !cxx = |> $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c %f -o %o |>
 !ld = |> $(CXX) $(LDFLAGS) $(LIBS) %f -o %o |>
+!ln = |> ln -sf %f %o |>
 
-:foreach *.cc |> !cxx |> obj/%B$(suffix).o {objects}
-:{objects} |> !ld |> kak
+:foreach *.cc |> !cxx |> %B$(suffix).o {objects}
+:{objects} |> !ld |> kak$(suffix)
+:kak$(suffix) |> !ln |> kak
diff --git a/rc/extra/tupfile.kak b/rc/extra/tupfile.kak
index 837dc185..ce8af71d 100644
--- a/rc/extra/tupfile.kak
+++ b/rc/extra/tupfile.kak
@@ -21,8 +21,8 @@ add-highlighter -group /tupfile/comment fill comment
 add-highlighter -group /tupfile/code regex "\%[fbBeoOdg]\b" 0:value
 add-highlighter -group /tupfile/code regex "\$\([\w_]+\)" 0:value
 add-highlighter -group /tupfile/code regex ":\s*(foreach)\b" 1:keyword
-add-highlighter -group /tupfile/code regex "(\.gitignore\b)" 0:keyword
-add-highlighter -group /tupfile/code regex "\bifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export\b" 0:keyword
+add-highlighter -group /tupfile/code regex "\.gitignore\b" 0:keyword
+add-highlighter -group /tupfile/code regex "\b(ifn?eq|ifn?def|else|endif|error|include|include_rules|run|preload|export)\b" 0:keyword
 add-highlighter -group /tupfile/code regex "\b(\&?[\w_]+)\s*[:+]?=" 1:keyword
 
 # Initialization