diff --git a/ipmitool/src/ipmitool.c b/ipmitool/src/ipmitool.c
index d433154..9bf2706 100644
--- a/ipmitool/src/ipmitool.c
+++ b/ipmitool/src/ipmitool.c
@@ -83,7 +83,7 @@ void usage(void)
 	printf("       -p port       Remote RMCP port (default is 623)\n");
 	printf("       -U username   Remote username\n");
 	printf("       -a            Prompt for remote password\n");
-	printf("       -E            Read remote password from environment variable IPMITOOL_PASSWORD\n");
+	printf("       -E            Read remote password from environment variable IPMI_PASSWORD\n");
 	printf("       -P password   Remote password\n");
 	printf("       -I intf       Inteface to use\n");
 	printf("\n\n");
@@ -313,6 +313,13 @@ int main(int argc, char ** argv)
 
 				password = strdup (tmp);
 			}
+			else if ((tmp = getenv("IPMI_PASSWORD")))
+			{
+			    	if (password)
+				    	free (password);
+
+				password = strdup (tmp);
+			}
 			break;
 
 		case 'a':