diff --git a/ipmitool/src/ipmitool.c b/ipmitool/src/ipmitool.c
index 22ee692..40e1bcb 100644
--- a/ipmitool/src/ipmitool.c
+++ b/ipmitool/src/ipmitool.c
@@ -293,6 +293,11 @@ int main(int argc, char ** argv)
 			break;
 		case 'P':
 			password = strdup(optarg);
+
+			/* Prevent password snooping with ps */
+			i = strlen (optarg);
+			memset (optarg, 'X', i);
+
 			break;
 		case 'U':
 			username = strdup(optarg);