diff --git a/ChangeLog b/ChangeLog
index 15953a8..f30f708 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-14  Niibe Yutaka  <gniibe@fsij.org>
 
+	* src/openpgp-do.c (proc_key_import): Fix checking extended header.
+
 	* src/hardclock.c: Remove.
 
 	* src/usb_prop.c (MSC_INTERFACE_NO): New.
@@ -13,6 +15,8 @@
 	* src/Makefile.in: Follow the rename of usb-msc.c and remove of
 	hardclock.c.
 
+	* src/pin-dnd.c, src/usb_prop.c: Follow the rename of usb-msc.h.
+
 2012-05-12  Niibe Yutaka  <gniibe@fsij.org>
 
 	* src/usb_msc.c (ep6_out): Rename (was: ep7_out).
diff --git a/src/pin-dnd.c b/src/pin-dnd.c
index 70d1de9..08238e6 100644
--- a/src/pin-dnd.c
+++ b/src/pin-dnd.c
@@ -25,7 +25,7 @@
 #include "ch.h"
 #include "board.h"
 #include "gnuk.h"
-#include "usb_msc.h"
+#include "usb-msc.h"
 
 struct folder {
   uint8_t parent;
diff --git a/src/usb_prop.c b/src/usb_prop.c
index bd1bf18..7bdf33c 100644
--- a/src/usb_prop.c
+++ b/src/usb_prop.c
@@ -74,7 +74,7 @@ vcom_port_setup_with_nodata (uint8_t RequestNo)
 #endif
 
 #ifdef PINPAD_DND_SUPPORT
-#include "usb_msc.h"
+#include "usb-msc.h"
 #define MSC_NUM_INTERFACES 1
 #else
 #define MSC_NUM_INTERFACES 0