diff --git a/cmd/dwelling-upload/main.go b/cmd/dwelling-upload/main.go
index d761fa1..0dd8acc 100644
--- a/cmd/dwelling-upload/main.go
+++ b/cmd/dwelling-upload/main.go
@@ -21,10 +21,10 @@ import (
 
 var (
 	listenAddress *string = flag.String("listen", "/var/run/dwelling-upload/sock", "listen address (ip:port|unix_path)")
-	uploadDir     *string = flag.String("upload-dir", "/srv/upload", "directory where uploaded files are stored")
-	keepForHours  *int    = flag.Int("keep-for", 36, "keep files for this much hours")
+	uploadDir     *string = flag.String("dir", "/srv/upload", "directory where uploaded files are stored")
+	expiry        *int    = flag.Int("expiry", 36, "keep files for this much hours")
 	storageSize   *int64  = flag.Int64("storage", 102400, "storage size in MiB for uploads")
-	fileSizeLimit *int64  = flag.Int64("file-size", 128, "max. size in MiB for files")
+	fileSize      *int64  = flag.Int64("file", 128, "max. size in MiB for files")
 
 	showVersion *bool = flag.Bool("v", false, "show version")
 )
@@ -91,7 +91,7 @@ func main() {
 	}
 
 	hand := http.NewUploadHandlers(logFile, *uploadDir, &uploadDirSize, string(hashSalt),
-		*keepForHours, *storageSize, *fileSizeLimit)
+		*expiry, *storageSize, *fileSize)
 
 	r := httpr.New()