diff -Naur ifp-line-0.2.4.6-orig/ifp.1 ifp-line-0.2.4.6/ifp.1
--- ifp-line-0.2.4.6-orig/ifp.1	2004-05-30 15:11:28.000000000 +0000
+++ ifp-line-0.2.4.6/ifp.1	2005-08-21 00:33:44.000000000 +0000
@@ -1,4 +1,4 @@
-.\" $Id: ifp.1,v 1.2 2004/05/30 15:11:28 yamajun Exp $
+.\" $Id: ifp.1,v 1.3 2005/05/15 15:17:46 yamajun Exp $
 .\"
 .\" Copyright (c)2004 Joe Wreschnig <piman@debian.org>
 .\"
@@ -13,11 +13,11 @@
 .\"
 .\" On Debian GNU/Linux systems, the GNU GPL can be found in
 .\" /usr/share/common-licenses/GPL-2.
-.TH IFP 1 "May 30th, 2004"
+.TH IFP 1 "May 16th, 2005"
 .SH NAME
 \fBifp\fR \- access iRiver iFP audio devices
 .SH SYNOPSIS
-\fBifp\fR \fIcommand\fR [\fIarguments ...\fR]
+\fBifp\fR [\fBoption\fR] \fIcommand\fR [\fIarguments ...\fR]
 .SH DESCRIPTION
 \fBifp\fR lets you manage your music on an iRiver iFP music player acting in
 "Manager Mode". If your player is using "UMS Mode", then you don't need
@@ -25,6 +25,14 @@
 .PP
 \fBifp\fR can upload or download files or directories, delete or make 
 directories on the device, format the device, or upgrade your firmware.
+.PP
+The following options are available:
+.TP
+\fB-h, --help\fR
+Print help message.
+.TP
+\fB-v, --version\fR
+Display the version number of \fBifp\fR.
 .SH COMMANDS
 .TP
 \fBls\ \fR[\fIdirectory\fR]
@@ -90,6 +98,13 @@
 will not delete your music, but may have many other detrimental effects.
 Don't turn the device off or unplug it while the firmware is updating,
 and don't attempt to upload new firmware with a low battery.
+.TP
+\fBhelp\fR
+Print help message.  Same as "\fB-h\fR | \fB--help\fR".
+.TP
+\fBversion\fR
+Display the version number of \fBifp\fR.  Same as "\fB-v\fR | \fB--version\fR".
+.TP
 .SH AUTHORS
 Pavel Kriz <pavkriz@gybon.cz> and Yamashiro, Jun <yamajun@{ofug.net,
 cr.ie.u-ryukyu.ac.jp}> wrote \fBifp\fR. This manual page was written
diff -Naur ifp-line-0.2.4.6-orig/ifp.c ifp-line-0.2.4.6/ifp.c
--- ifp-line-0.2.4.6-orig/ifp.c	2004-12-18 03:24:26.000000000 +0000
+++ ifp-line-0.2.4.6/ifp.c	2005-08-21 00:37:04.000000000 +0000
@@ -11,6 +11,7 @@
 #include "ifp_routines.h"
 
 void help(char *prog);
+void version(char *prog);
 
 extern int IFP_BULK_TO;
 extern int IFP_BULK_FROM;
@@ -43,10 +44,14 @@
     if (strstr(argv[0],"/mc/extfs/"))
 	is_mc = IS_MC; else is_mc = IS_IFP;
 
-    /* no command */
-    if (argc < 2) {
+    /* no command, or help */
+    if (argc < 2 || strstr(argv[1], "help") || !strcmp("-h", argv[1])) {
 	help(argv[0]);
 	return 0;
+    } else if (strstr(argv[1], "version") || !strcmp("-v", argv[1])) { 
+	// "version" command or "-v | -version | --version" options. 
+	version(argv[0]); 
+	return 0; 
     }
 	    
     usb_init();
@@ -250,10 +255,7 @@
 }
 
 void help(char *prog) {
-    printf("%s: File manager for iRiver iFP music player. (version %s)\n",
-	    prog, IFP_VERSION);
-    printf("\n");
-    printf("usage: %s command params\n",prog);
+    printf("usage: %s [-hv] command [params ...]\n",prog);
     printf("commands:\n");
     printf("    ls [directory]\n");
     printf("    df\n");
@@ -273,8 +275,13 @@
     printf("    firmversion\n");
     printf("    format\n");
     printf("    firmupdate /path/to/FIRMWARE.HEX\n");
+    printf("    help\n");
+    printf("    version\n");
     printf("\n");
     printf("Note: This program cannot work with UMS firmware.\n");
-    printf("\n");
 }
 
+void version(char *prog) { 
+    printf("%s: File manager for iRiver iFP music player. (version %s)\n", 
+        prog, IFP_VERSION); 
+}
diff -Naur ifp-line-0.2.4.6-orig/README ifp-line-0.2.4.6/README
--- ifp-line-0.2.4.6-orig/README	2004-08-18 08:35:25.000000000 +0000
+++ ifp-line-0.2.4.6/README	2005-08-21 00:37:15.000000000 +0000
@@ -28,9 +28,15 @@
     # ./nonroot.sh	(configuration for run ifp command by non-root users)
 
 USAGE
-    ./ifp command params
+    ./ifp [option] command params
     (Need permission to read/write USB device for run ifp)
     
+    - options:
+	-h, --help
+	    Print help message.
+	-v, --version
+	    Display the version number of ifp.
+
     - commands:
         ls [directory]
         df
@@ -46,6 +52,8 @@
 	firmversion
 	format
 	firmupdate /path/to/FIRMWARE.HEX
+	help
+	version
 	
 COMMENTS
     - terms UPLOAD & DOWNLOAD are inversed against those stupid iRiverManager's