diff --git a/LICENSE b/LICENSE
index 7b0e268..7cd929a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,6 +2,8 @@ MIT/X Consortium License
 
 © 2009-2011 Anselm R Garbe <anselm@garbe.us>
 © 2011 Szabolcs Nagy <nszabolcs@gmail.com>
+© 2014 Hiltjo Posthuma <hiltjo@codemadness.org>
+© 2014 Laslo Hunhold <dev@frign.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/quark.c b/quark.c
index b1aacb3..5e8e43e 100644
--- a/quark.c
+++ b/quark.c
@@ -541,12 +541,12 @@ main(int argc, char *argv[]) {
 	struct group *gpwd;
 	int i;
 
-	/* arguments */
-	for(i = 1; i < argc; i++)
-		if(!strcmp(argv[i], "-v"))
-			die("quark-"VERSION", © 2009-2011 Anselm R Garbe\n");
-		else
-			die("usage: quark [-v]\n");
+	ARGBEGIN {
+	case 'v':
+		die("quark-"VERSION"\n");
+	default:
+		die("usage: %s [-v]\n", argv0);
+	} ARGEND;
 
 	/* sanity checks */
 	if(user)