diff --git a/ChangeLog b/ChangeLog
index 3acc0e6d..6273dfc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-06  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/chpasswd.c, src/chgpasswd.c: The crypt_method string always
+	points to a constant string. Add the const qualifier.
+
 2008-01-06  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/pwunconv.c: Remove prototype of l64a() (not used in
diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index 1a992d85..f2bde98d 100644
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -55,7 +55,7 @@ static int eflg = 0;
 static int md5flg = 0;
 static int sflg = 0;
 
-static char *crypt_method = NULL;
+static const char *crypt_method = NULL;
 static long sha_rounds = 5000;
 
 #ifdef SHADOWGRP
diff --git a/src/chpasswd.c b/src/chpasswd.c
index df98bae9..30d4e7eb 100644
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -54,7 +54,7 @@ static int eflg = 0;
 static int md5flg = 0;
 static int sflg = 0;
 
-static char *crypt_method = NULL;
+static const char *crypt_method = NULL;
 static long sha_rounds = 5000;
 
 static int is_shadow_pwd;