Index: uspace/app/inet/inet.c
===================================================================
--- uspace/app/inet/inet.c	(revision f538ef39c116fd1e8552705280af8e806df93b39)
+++ uspace/app/inet/inet.c	(revision 75c383031764d7fca6456989fdd52eef0dc4ecb1)
@@ -49,9 +49,13 @@
 static void print_syntax(void)
 {
+	printf("%s: Internet configuration utility.\n", NAME);
 	printf("Syntax:\n");
-	printf("  %s create <addr>/<width> <link-name> <addr-name>\n", NAME);
-	printf("  %s delete <link-name> <addr-name>\n", NAME);
-	printf("  %s add-sr <dest-addr>/<width> <router-addr> <route-name>\n", NAME);
-	printf("  %s del-sr <route-name>\n", NAME);
+	printf("  %s list-addr\n", NAME);
+	printf("  %s create-addr <addr>/<width> <link-name> <addr-name>\n", NAME);
+	printf("  %s delete-addr <link-name> <addr-name>\n", NAME);
+	printf("  %s list-sr\n", NAME);
+	printf("  %s create-sr <dest-addr>/<width> <router-addr> <route-name>\n", NAME);
+	printf("  %s delete-sr <route-name>\n", NAME);
+	printf("  %s list-link\n", NAME);
 }
 
@@ -265,8 +269,4 @@
 	}
 
-	table_set_margin_left(table, 4);
-
-	printf("Configured addresses:\n\n");
-
 	table_header_row(table);
 	table_printf(table, "Addr/Width\t" "Link-Name\t" "Addr-Name\t"
@@ -309,7 +309,5 @@
 	}
 
-	if (count == 0) {
-		printf("None\n");
-	} else {
+	if (count != 0) {
 		rc = table_print_out(table, stdout);
 		if (rc != EOK) {
@@ -318,6 +316,4 @@
 		}
 	}
-
-	printf("\n");
 
 	rc = EOK;
@@ -358,7 +354,4 @@
 	}
 
-	table_set_margin_left(table, 4);
-
-	printf("IP links:\n\n");
 	table_header_row(table);
 	table_printf(table, "Link-layer Address\t" "Link-Name\t" "Def-MTU\n");
@@ -384,7 +377,5 @@
 	}
 
-	if (count == 0) {
-		printf("None\n");
-	} else {
+	if (count != 0) {
 		rc = table_print_out(table, stdout);
 		if (rc != EOK) {
@@ -393,6 +384,4 @@
 		}
 	}
-
-	printf("\n");
 
 	rc = EOK;
@@ -430,7 +419,4 @@
 	}
 
-	table_set_margin_left(table, 4);
-
-	printf("Static routes:\n\n");
 	table_header_row(table);
 	table_printf(table, "Dest/Width\t" "Router-Addr\t" "Route-Name\n");
@@ -471,7 +457,5 @@
 	}
 
-	if (count == 0) {
-		printf("None\n");
-	} else {
+	if (count != 0) {
 		rc = table_print_out(table, stdout);
 		if (rc != EOK) {
@@ -480,6 +464,4 @@
 		}
 	}
-
-	printf("\n");
 
 	rc = EOK;
@@ -509,31 +491,35 @@
 	}
 
-	if (argc < 2) {
+	if (argc < 2 || str_cmp(argv[1], "-h") == 0) {
+		print_syntax();
+		return 0;
+	}
+
+	if (str_cmp(argv[1], "list-addr") == 0) {
 		rc = addr_list();
 		if (rc != EOK)
 			return 1;
+	} else if (str_cmp(argv[1], "create-addr") == 0) {
+		rc = addr_create_static(argc - 2, argv + 2);
+		if (rc != EOK)
+			return 1;
+	} else if (str_cmp(argv[1], "delete-addr") == 0) {
+		rc = addr_delete(argc - 2, argv + 2);
+		if (rc != EOK)
+			return 1;
+	} else if (str_cmp(argv[1], "list-sr") == 0) {
 		rc = sroute_list();
 		if (rc != EOK)
 			return 1;
+	} else if (str_cmp(argv[1], "create-sr") == 0) {
+		rc = sroute_create(argc - 2, argv + 2);
+		if (rc != EOK)
+			return 1;
+	} else if (str_cmp(argv[1], "delete-sr") == 0) {
+		rc = sroute_delete(argc - 2, argv + 2);
+		if (rc != EOK)
+			return 1;
+	} else if (str_cmp(argv[1], "list-link") == 0) {
 		rc = link_list();
-		if (rc != EOK)
-			return 1;
-		return 0;
-	}
-
-	if (str_cmp(argv[1], "create") == 0) {
-		rc = addr_create_static(argc - 2, argv + 2);
-		if (rc != EOK)
-			return 1;
-	} else if (str_cmp(argv[1], "delete") == 0) {
-		rc = addr_delete(argc - 2, argv + 2);
-		if (rc != EOK)
-			return 1;
-	} else if (str_cmp(argv[1], "add-sr") == 0) {
-		rc = sroute_create(argc - 2, argv + 2);
-		if (rc != EOK)
-			return 1;
-	} else if (str_cmp(argv[1], "del-sr") == 0) {
-		rc = sroute_delete(argc - 2, argv + 2);
 		if (rc != EOK)
 			return 1;