diff --git a/cmd/dwelling-home/main.go b/cmd/dwelling-home/main.go
index 8cbccff..5836dfe 100644
--- a/cmd/dwelling-home/main.go
+++ b/cmd/dwelling-home/main.go
@@ -20,10 +20,10 @@ import (
 var version string
 
 var showVersion *bool = flag.Bool("v", false, "show version")
-var listenAddress *string = flag.String("listen", "/var/run/dwelling-home/sock", "listen address (ip:port|unix_path)")
-var captchaExpiry *time.Duration = flag.Duration("captcha-expiry", 10*time.Minute, "CAPTCHA expiry (e.g. 5m, 60s)")
-var guestbookOwner *string = flag.String("gb-owner", "Admin", "name of a guestbook owner")
-var guestbookPageSize *int64 = flag.Int64("gb-pagesz", 60, "size of a guestbook page")
+var listenAddress *string = flag.String("l", "/var/run/dwelling-home/sock", "listen address (ip:port|unix_path)")
+var captchaExpiry *time.Duration = flag.Duration("ce", 10*time.Minute, "CAPTCHA expiry (e.g. 5m, 60s)")
+var guestbookOwner *string = flag.String("gbo", "Admin", "name of a guestbook owner")
+var guestbookPageSize *int64 = flag.Int64("gbo", 60, "size of a guestbook page")
 var databasesPath *string = flag.String("db", "/var/lib/dwelling-home", "path to a directory where to store DB files")
 
 func main() {
diff --git a/init/systemd.service b/init/systemd.service
index 9f1d5f1..f63b6f0 100644
--- a/init/systemd.service
+++ b/init/systemd.service
@@ -6,7 +6,7 @@ After=network-online.target
 Type=simple
 Restart=on-failure
 DynamicUser=yes
-ExecStart=/usr/bin/dwelling-home -listen /var/run/dwelling-home/sock -db /var/lib/dwelling-home -captcha-expiry 10m -gb-owner Arav -gb-pagesz 60
+ExecStart=/usr/bin/dwelling-home -l /var/run/dwelling-home/sock -db /var/lib/dwelling-home -ce 10m -gbo Arav -gbp 60
 
 ReadOnlyPaths=/