diff --git a/README.md b/README.md
index b3b0653..953f976 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ayu-ng
+# kanako
 Rewrite of `ayu(1)`, an actually boring password manager, now with interchangeable encryption backend.
 
 ## Backends supported
diff --git a/config.mk b/config.mk
new file mode 100644
index 0000000..a67a797
--- /dev/null
+++ b/config.mk
@@ -0,0 +1 @@
+PREFIX=/usr/local
diff --git a/ayu-ng b/kanako
similarity index 84%
rename from ayu-ng
rename to kanako
index 59faac3..8d535de 100755
--- a/ayu-ng
+++ b/kanako
@@ -1,12 +1,12 @@
 #!/bin/sh -e
 
-conf_dir=${conf_dir:-$HOME/.config/ayu}
-key_dir=${key_dir:-$HOME/.ayu}
-store_dir=${store_dir:-$HOME/.ayu-store}
+conf_dir=${conf_dir:-$HOME/.config/kanako}
+key_dir=${key_dir:-$HOME/.kanako}
+store_dir=${store_dir:-$HOME/.kanako-store}
 
 cd ${store_dir} || exit 1
 
-. ${conf_dir}/config
+. ${conf_dir}/kanako.conf
 
 fn_copy() {
     fn_view $2 | ${clip}
@@ -18,7 +18,7 @@ fn_edit() {
     rm ${1%%.enc}
 }
 fn_generate() {
-    pwgen -s ${2:-80}
+    pwgen -s ${1:-80}
 }
 fn_list() {
     if command -v tree 2>/dev/null; then
@@ -58,7 +58,7 @@ case $1 in
     -e | edit) fn_edit $2 ;;
     -g | generate) fn_generate $2 ;;
     -l | list) fn_list ;;
-    -n | add) fn_new ;;
+    -n | add) fn_new $2 ;;
     -r | trash) fn_trash $2 ;;
     -R | trashd) fn_trash_directory $2 ;;
     -v | view) fn_view $2 ;;
diff --git a/ayu-ng.conf.example b/kanako.conf.example
similarity index 100%
rename from ayu-ng.conf.example
rename to kanako.conf.example
diff --git a/kanako.conf.mdoc b/kanako.conf.mdoc
new file mode 100644
index 0000000..80f5175
--- /dev/null
+++ b/kanako.conf.mdoc
@@ -0,0 +1,31 @@
+.Dd Bureaucracy 65, 3188
+.Dt KANAKO.CONF 5
+.Os
+.Sh NAME
+.Nm kanako.conf
+.Nd configuration file for
+.Xr kanako 1
+.Sh KEYS
+.Ss General section
+.Bl -tag -width 11n -compact
+.It clip
+Clipboard program to use with
+the program. Default is xclip
+.El
+.Ss Encryption section
+.Bl -tag -width 11n -compact
+.It encrypt_cmd
+Command to handle encryption
+Default is 'age'
+.It encrypt_args
+Options to be passed to
+encrypt_cmd for encryption
+.It decrypt_args
+Options to be passed to
+encrypt_cmd for decryption
+.El
+.Sh SEE ALSO
+.Xr kanako 1
+.Sh AUTHORS
+.An Aoi Koizumi Aq Mt koizumi.aoi@kyoko-project.wer.ee
+  
diff --git a/ayu-ng.mdoc b/kanako.mdoc
similarity index 80%
rename from ayu-ng.mdoc
rename to kanako.mdoc
index b0a97f8..4c82b9f 100644
--- a/ayu-ng.mdoc
+++ b/kanako.mdoc
@@ -1,9 +1,9 @@
-.Dd Bureaucracy 62, 3188
-.Dt AYU-NG 1
+.Dd Bureaucracy 65, 3188
+.Dt KANAKO 1
 .Os
 .Sh NAME
-.Nm ayu-ng
-.Nd rewrite of ayu, an actually boring password manager
+.Nm kanako
+.Nd the adaptable password manager
 .Sh DESCRIPTION
 
 .Sh USAGE
@@ -27,7 +27,11 @@ View an entry
 .Bl
 .El
 .Sh SEE ALSO
-.Xr 5 ayu-ng.conf
+.Xr age 1
+.Xr gpg 1
+.Xr kanako.conf 5
+.Xr pwgen 1
+.Xr salty 1
 .Rs
 .%A Rob Pike
 .%T "UNIX Style, or cat -v Considered Harmful"
@@ -40,4 +44,4 @@ View an entry
 Under the Wayland display protocol,
 the clipboard subcommand won't work,
 due to 'Permission denied'. On X11
-it works just fine.
\ No newline at end of file
+it works just fine.
diff --git a/mkfile b/mkfile
new file mode 100644
index 0000000..ee6f6bc
--- /dev/null
+++ b/mkfile
@@ -0,0 +1,8 @@
+<config.mk
+
+install:
+	install -Dm0755 kanako $PREFIX/bin/kanako
+	install -Dm0644 kanako.mdoc $PREFIX/share/man/man1/kanako.1
+	install -Dm0644 kanako.conf.mdoc $PREFIX/share/man/man5/kanako.conf.5
+uninstall:
+	rm -f $PREFIX/bin/kanako $PREFIX/share/man/man1/kanako.1 $PREFIX/share/man/man5/kanako.conf.5