diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 97479e0..90419d0 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -67,7 +67,6 @@
      (print banner-line)
      (newline)
      (print "Command-line options:")
-     (newline)
      (print-help)
      (newline)
      (exit 0))
@@ -93,21 +92,21 @@
 	   (*bank-dir* dir))
  (-checked (file) "JendaSAP checked.ntlm file"
 	   (*jendasap-checked* file))
- (-ml-all () "Load all mailman lists"
-	  (-ml-all- #t))
- (-destroyed () "Show destroyed members in -fees"
-	     (-show-destroyed- #t))
+ ""
+ "Email options:"
+ (-from (email) "Sender email address"
+	(*email-from* email))
  (-sendmail () "Actually send emails"
 	    (-send-emails- #t))
  (-mailto (email) "Override all outgoing emails destination"
 	  (*mailto-override* email))
+ ""
+ "Output options:"
  (-logfile (filename) "Enable logging to file"
 	   (*log-file* filename))
  (-quiet () "Suppress all output"
 	 (*stdout-quiet* #t)
 	 (*progress-quiet* #t))
- (-from (email) "Sender email address"
-	(*email-from* email))
  ""
  "Query options:"
  (-mi (id) "Specify member by id" (-member-id- (string->number id)))
@@ -116,41 +115,56 @@
 	(-action- 'no-op))
       (-member-nick- nick))
  ""
- "Actions:"
+ "Misc options:"
+ (-destroyed () "Show destroyed members in -fees"
+	     (-show-destroyed- #t))
+ (-ml-all () "Load all mailman lists"
+	  (-ml-all- #t))
+ ""
+ "Base Actions:"
  (-info () "Print information"
 	(-needs-bank- #t)
 	(-action- 'print-info))
- (-stats (file:gnuplot-data) "Get stats for all months"
-	 (-action- 'print-stats)
-	 (-fname- file:gnuplot-data))
  (-print () "Print given member file"
 	 (-action- 'print-member-file))
- (-tests () "Run self-tests upon startup" (-run-tests?- #t))
- (-idstats () "Returns information about available member ids" (-action- 'print-idstats))
- (-genid () "Generates random member id" (-action- 'genid))
- (-gencards (file:cards file:desfires) "Generates brmdoor-compatible card files"
-	    (-action- 'gencards)
-	    (-fname- (list file:cards file:desfires)))
- (-problems () "Prints all files with problems" (-action- 'problems))
  (-fees () "Prints fees table"
 	(-needs-bank- #t)
 	(-action- 'fees))
+ (-problems () "Prints all files with problems"
+	    (-action- 'problems))
+ (-status () "Show members directory status"
+	  (-action- 'status))
+ (-unpaired () "Show latest unpaired bank transactions"
+	    (-needs-bank- #t)
+	    (-action- 'unpaired))
+ (-edit () "Edit selected user"
+	(-action- 'edit))
+ ""
+ "Id Management Actions:"
+ (-idstats () "Returns information about available member ids"
+	   (-action- 'print-idstats))
+ (-genid () "Generates random member id"
+	 (-action- 'genid))
+ ""
+ "Export Actions:"
+ (-gencards (file:cards file:desfires) "Generates brmdoor-compatible card files"
+	    (-action- 'gencards)
+	    (-fname- (list file:cards file:desfires)))
  (-genweb (dir) "Generate static web files"
 	  (-needs-bank- #t)
 	  (-web-dir- dir)
 	  (-action- 'genweb))
- (-repl () "Start REPL with everything loaded"
-	(-needs-bank- #t)
-	(-action- 'repl))
- (-edit () "Edit selected user"
-	(-action- 'edit))
- (-unpaired () "Show latest unpaired bank transactions"
-	    (-needs-bank- #t)
-	    (-action- 'unpaired))
+ (-stats (file:gnuplot-data) "Get stats for all months"
+	 (-action- 'print-stats)
+	 (-fname- file:gnuplot-data))
+ ""
+ "Mailman Actions:"
  (-mlcheck () "Check internal ML"
 	   (-action- 'mlcheck))
  (-mlsync () "Synchronize internal ML"
 	  (-action- 'mlsync))
+ ""
+ "Email Actions:"
  (-notify () "Members with debt for more than 1 month"
 	  (-notify-months- 1)
 	  (-needs-bank- #t)
@@ -159,11 +173,16 @@
 	   (-notify-months- 3)
 	   (-needs-bank- #t)
 	   (-action- 'notify))
- (-status () "Show members directory status"
-	  (-action- 'status))
  (-summary () "Send summary email"
 	   (-needs-bank- #t)
 	   (-action- 'summary))
+ ""
+ "Development Actions:"
+ (-tests () "Run self-tests upon startup"
+	 (-run-tests?- #t))
+ (-repl () "Start REPL with everything loaded"
+	(-needs-bank- #t)
+	(-action- 'repl))
  )
 
 ;; Print banner