diff --git a/ChangeLog b/ChangeLog
index d26d099..f9544b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,8 +6,6 @@
 	(gpg_pw_increment_err_counter): Rename from gpg_increment_err_counter.
 	* src/ac.c, src/openpgp.c, src/gnuk.h: Follow the change.
 
-2011-05-09  NIIBE Yutaka  <gniibe@fsij.org>
-
 	Bug fixes.
 	* src/openpgp.c (cmd_reset_user_password, cmd_change_password)
 	* src/openpgp-do.c (proc_resetting_code): Fix check of return value.
diff --git a/src/ac.c b/src/ac.c
index 6423c68..0011351 100644
--- a/src/ac.c
+++ b/src/ac.c
@@ -65,7 +65,7 @@ verify_pso_cds (const uint8_t *pw, int pw_len)
   int r;
   uint8_t keystring[KEYSTRING_SIZE_PW1];
 
-  if (gpg_passwd_locked (PW_ERR_PW1))
+  if (gpg_pw_locked (PW_ERR_PW1))
     return 0;
 
   DEBUG_INFO ("verify_pso_cds\r\n");
@@ -93,7 +93,7 @@ verify_other (const uint8_t *pw, int pw_len)
 
   DEBUG_INFO ("verify_other\r\n");
 
-  if (gpg_passwd_locked (PW_ERR_PW1))
+  if (gpg_pw_locked (PW_ERR_PW1))
     return 0;
 
   ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
@@ -170,7 +170,7 @@ verify_admin_0 (const uint8_t *pw, int buf_len, int pw_len_known)
   const uint8_t *pw3_keystring;
   int pw_len;
 
-  if (gpg_passwd_locked (PW_ERR_PW3))
+  if (gpg_pw_locked (PW_ERR_PW3))
     return 0;
 
   pw3_keystring = gpg_do_read_simple (NR_DO_KEYSTRING_PW3);
diff --git a/src/openpgp-do.c b/src/openpgp-do.c
index ae69662..8f2a577 100644
--- a/src/openpgp-do.c
+++ b/src/openpgp-do.c
@@ -837,7 +837,6 @@ proc_key_import (const uint8_t *data, int len)
 {
   int r;
   enum kind_of_key kk;
-  const uint8_t *pw3_keystring;
   const uint8_t *keystring_admin;
 
   if (admin_authorized == BY_ADMIN)