diff -pruN freeipmi/doc/freeipmi.texi freeipmi-hacked/doc/freeipmi.texi
--- freeipmi/doc/freeipmi.texi	2005-08-27 15:59:44.000000000 +0530
+++ freeipmi-hacked/doc/freeipmi.texi	2005-10-14 00:26:47.000000000 +0530
@@ -53,6 +53,7 @@ release @value{VERSION} of the GNU FreeI
 * fish::                        FreeIPMI SHell.
 * bmc-config::                  Baseboard Management Controller configurator.
 * bmc-info::                    Baseboard Management Controller information.
+* bmc-autoconfig::              Wizard-like frontend for bmc-config.
 * ipmi-sensors::                @acronym{IPMI} sensors utility.
 * ipmi-sel::                    @acronym{IPMI} System Event Log.
 * bmc-watchdog::                Watchdog daemon.
@@ -902,7 +903,7 @@ Section LAN_Conf_Auth
 EndSection
 @end example
 
address@hidden bmc-info, ipmi-sensors, bmc-config, Top
address@hidden bmc-info, bmc-autoconfig, bmc-config, Top
 @chapter bmc-info
 @pindex bmc-info
 @command{bmc-info} command displays BMC/@acronym{IPMI} version information and
@@ -944,7 +945,26 @@ Aux Firmware Revision Info: Boot Code v0
 debian-ia64:~# 
 @end example
 
address@hidden ipmi-sensors, ipmi-sel, bmc-info, Top
address@hidden bmc-autoconfig, ipmi-sensors, bmc-info, Top
address@hidden bmc-autoconfig
address@hidden bmc-autoconfig
address@hidden utility is a wizard-like frontend to the
address@hidden command, which has a curses/text based interfaced
+questionaire asking for IP/Netmask/Gateway to be committed.
+
address@hidden Command-line options
address@hidden @bullet
address@hidden -u, --usage @*
+      Show short usage message.
+
address@hidden -h, --help @*
+      Show help.
+
address@hidden -V, --version @*
+      Show version information.
address@hidden itemize
+
address@hidden ipmi-sensors, ipmi-sel, bmc-autoconfig, Top
 @chapter ipmi-sensors
 @pindex ipmi-sensors
 @command{ipmi-sensors} utility reports the monitored system health
diff -pruN freeipmi/fish/scripts/bmc-autoconfig/bmc-autoconfig freeipmi-hacked/fish/scripts/bmc-autoconfig/bmc-autoconfig
--- freeipmi/fish/scripts/bmc-autoconfig/bmc-autoconfig	2005-10-12 19:04:33.000000000 +0530
+++ freeipmi-hacked/fish/scripts/bmc-autoconfig/bmc-autoconfig	2005-10-14 00:27:17.000000000 +0530
@@ -24,6 +24,10 @@ _init ()
     # autotool'ize these two?
     TEMPLATE_DIR="/var/lib/freeipmi";
     TEMPLATE="${TEMPLATE_DIR}/bmc-config-template";
+    VERSION="0.1";
+    ME=$(basename ${0});
+    SUPPORT_EMAIL="address@hidden";
+    DESCRIPTION="${ME} is an autoconfiguration tool and wrapper around bmc-config"
 
     PROG=$(which dialog 2>/dev/null || which whiptail 2>/dev/null);
 
@@ -32,6 +36,7 @@ _init ()
 	return 1;
     }
 
+
     exec 3>&1
 
     ip="0.0.0.0";
@@ -72,7 +77,7 @@ validate_ip_address ()
 
     quad=${1}
     
-    echo "${oct}" | grep -Eq "^[0-9\.]+$" || {
+    echo "${quad}" | grep -Eq "^[0-9\.]+$" || {
 	echo "ERROR: Input cannot have non-numericals";
 	return 1;
     }
@@ -137,14 +142,45 @@ accept_input ()
 
 main ()
 {
-    ip=$(accept_input get_ip_address validate_ip_address) &&
-    nm=$(accept_input get_netmask validate_ip_address) &&
-    gw=$(accept_input get_gateway_ip_address validate_ip_address) && {
-	${BMC_CONFIG} --commit -f "${TEMPLATE}";
-	${BMC_CONFIG} --commit -k "Lan_Conf:IP_Address=${ip}";
-	${BMC_CONFIG} --commit -k "Lan_Conf:Subnet_Mask=${nm}";
-	${BMC_CONFIG} --commit -k "Lan_Conf:Default_Gateway_IP_Address=${gw}";
-    }
+    case "${1}" in 
+	'--usage'|'-u')
+	    cat <<EOF
+Usage: ${ME} [-?V] [--help] [--usage] [--version]
+EOF
+	    ;;
+	'--help'|'-h')
+	    cat <<EOF
+Usage: ${ME} [OPTION...]
+${DESCRIPTION}
+
+  -h, --help          Give this help list
+  -u, --usage         Give a short usage message
+  -V, --version       Print program version
+
+Report bugs to ${SUPPORT_EMAIL}
+EOF
+	    ;;
+	'--version'|'-V')
+	    echo ${ME} ${VERSION};
+	    ;;
+	'')
+	    ip=$(accept_input get_ip_address validate_ip_address) &&
+	    nm=$(accept_input get_netmask validate_ip_address) &&
+	    gw=$(accept_input get_gateway_ip_address validate_ip_address) && {
+		${BMC_CONFIG} --commit -f "${TEMPLATE}";
+		${BMC_CONFIG} --commit -k "Lan_Conf:IP_Address=${ip}";
+		${BMC_CONFIG} --commit -k "Lan_Conf:Subnet_Mask=${nm}";
+		${BMC_CONFIG} --commit -k "Lan_Conf:Default_Gateway_IP_Address=${gw}";
+	    }
+	    ;;
+	*)
+	    cat <<EOF
+${ME}: invalid option -- ${1}
+Try \`${ME} --help' or \`${ME} --usage' for more information.
+EOF
+	
+    esac
+
 }
 
 _init "$@" && main "$@";