2 files changed, 11 insertions, 9 deletions

diff --git a/include/applets.h b/include/applets.h
index 386f4b110..00d3aee1e 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -132,8 +132,8 @@ USE_FSCK(APPLET(fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
 //USE_E2FSCK(APPLET_NOUSAGE(fsck.ext2, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
 //USE_E2FSCK(APPLET_NOUSAGE(fsck.ext3, e2fsck, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_FSCK_MINIX(APPLET_ODDNAME(fsck.minix, fsck_minix, _BB_DIR_SBIN, _BB_SUID_NEVER, fsck_minix))
-USE_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER,ftpget))
-USE_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER,ftpput))
+USE_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpget))
+USE_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, _BB_DIR_USR_BIN, _BB_SUID_NEVER, ftpput))
 USE_FUSER(APPLET(fuser, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_GETENFORCE(APPLET(getenforce, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
 USE_GETOPT(APPLET(getopt, _BB_DIR_BIN, _BB_SUID_NEVER))
@@ -293,7 +293,7 @@ USE_SYSLOGD(APPLET(syslogd, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_TAIL(APPLET(tail, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_TAR(APPLET(tar, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_TASKSET(APPLET(taskset, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-USE_TCPSVD(APPLET(tcpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER, tcpsvd))
 USE_TEE(APPLET(tee, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_TELNET(APPLET(telnet, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_TELNETD(APPLET(telnetd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
@@ -311,7 +311,7 @@ USE_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 //USE_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
-USE_UDPSVD(APPLET(udpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_UDPSVD(APPLET_ODDNAME(udpsvd, tcpudpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER, udpsvd))
 USE_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_NEVER))
diff --git a/include/usage.h b/include/usage.h
index bab14f5c3..5f1bf24cb 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3331,7 +3331,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n	-l	Prints names of all matching files even when
 /*     "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [ -t sec] ip port prog..." */
 #define tcpsvd_full_usage \
        "Creates TCP socket, binds it to host:port and listens on in\n" \
-       "for incoming connections. For each connection it runs prog" \
+       "for incoming connections. For each connection it runs prog." \
      "\n" \
      "\nip              IP to listen on. '0' = all" \
      "\nport            Port to listen on" \
@@ -3339,27 +3339,29 @@ USE_FEATURE_RUN_PARTS_FANCY("\n	-l	Prints names of all matching files even when
      "\n-l name         Local hostname (else looks up local hostname in DNS)" \
      "\n-u user[:group] Change to user/group after bind" \
      "\n-c n            Handle up to n connections simultaneously" \
+     "\n-b n            Allow a backlog of approximately n TCP SYNs" \
      "\n-C n[:msg]      Allow only up to n connections from the same IP" \
      "\n                New connections from this IP address are closed" \
      "\n                immediately. 'msg' is written to the peer before close" \
      "\n-h              Look up peer's hostname" \
-     "\n-b n            Allow a backlog of approximately n TCP SYNs" \
      "\n-E              Do not set up TCP-related environment variables" \
      "\n-v              Verbose"
 
 #define udpsvd_trivial_usage \
-       "[-hv] [-u user] [-l name] host port prog"
+       "[-hEv] [-u user] [-l name] host port prog"
 #define udpsvd_full_usage \
        "Creates UDP socket, binds it to host:port and listens on in\n" \
-       "for incoming packets. When packet arrives it runs prog.\n" \
-       "When prog exits, it start to listen on the socket again" \
+       "for incoming packets. For each packet it runs prog\n" \
+       "(redirecting all further packets with same peer ip:port to it)." \
      "\n" \
      "\nip              IP to listen on. '0' = all" \
      "\nport            Port to listen on" \
      "\nprog [arg]      Program to run" \
      "\n-l name         Local hostname (else looks up local hostname in DNS)" \
      "\n-u user[:group] Change to user/group after bind" \
+     "\n-c n            Handle up to n connections simultaneously" \
      "\n-h              Look up peer's hostname" \
+     "\n-E              Do not set up TCP-related environment variables" \
      "\n-v              Verbose"
 
 #define tftp_trivial_usage \