diff --git a/.config/kak/autoload/xml.kak b/.config/kak/autoload/xml.kak
new file mode 100644
index 00000000..85e50726
--- /dev/null
+++ b/.config/kak/autoload/xml.kak
@@ -0,0 +1,14 @@
+# surround
+
+define-command -hidden -params 1 xml-surround-add-impl %~
+    evaluate-commands -save-regs 'a' -no-hooks %^
+        set-register a %arg{1}
+        execute-keys -draft '_i<lt><c-r>a<gt><a-;>a<lt>/<c-r>a<gt>'
+    ^
+~
+define-command -hidden -params 1 xml-surround-remove-impl %~
+    evaluate-commands -save-regs 'a"' -no-hooks %^
+        set-register a %arg{1}
+        execute-keys -save-regs '"' -draft '<a-/><lt><c-r>a<gt><ret>d/<lt>/<c-r>a<gt>d'
+    ^
+~