diff --git a/AUTHORS b/AUTHORS
index dcea8e7..d229970 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,10 +4,14 @@ Kaz Kojima:
 	boards/STM32_PRIMER2/board.h
 	boards/STM32_PRIMER2/board.mk
 	boards/STM32_PRIMER2/mcuconf.h
-	boards/STM32_PRIMER2/hw_config.c
 
 NIIBE Yutaka:
     Founder of the project.
+    Added CQ STARM support:
+	boards/CQ_STARM/board.c
+	boards/CQ_STARM/board.h
+	boards/CQ_STARM/board.mk
+	boards/CQ_STARM/mcuconf.h
     Wrote:
 	gnuk.svg
 	src/configure
diff --git a/ChangeLog b/ChangeLog
index 551a63f..e760986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-21  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* boards/common/hw_config.c (Get_SerialNum): Removed.
+	* src/usb_prop.c (gnuk_device_init): Remove calling Get_SerialNum.
+	* src/usb_desc.c (gnukStringSerial): Updated.
+	* boards/CQ_STARM/board.c (set_led): Fix polarity.
+
 2010-10-20  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* FSIJ_SERIAL_NUMBER: New.
diff --git a/boards/CQ_STARM/board.c b/boards/CQ_STARM/board.c
index ba02060..cd2a779 100644
--- a/boards/CQ_STARM/board.c
+++ b/boards/CQ_STARM/board.c
@@ -31,7 +31,7 @@ void
 set_led (int value)
 {
   if (value)
-    palClearPad (IOPORT3, GPIOC_LED);
-  else
     palSetPad (IOPORT3, GPIOC_LED);
+  else
+    palClearPad (IOPORT3, GPIOC_LED);
 }
diff --git a/boards/common/hw_config.c b/boards/common/hw_config.c
index 69f7d54..739451c 100644
--- a/boards/common/hw_config.c
+++ b/boards/common/hw_config.c
@@ -31,8 +31,3 @@ Leave_LowPowerMode (void)
   else
     bDeviceState = ATTACHED;
 }
-
-void
-Get_SerialNum (void)
-{
-}
diff --git a/doc/HACKING b/doc/HACKING
index da0c337..05a9a69 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -1,4 +1,4 @@
-* configure support
+* [DONE] configure support
 
 configure script would be good to select a board and to generate
 random serial number.
@@ -29,7 +29,7 @@ It would be good not to use malloc.
 Get it from FSFE.
 
 
-* Serial number
+* [Partially DONE] Serial number
 
 Currently, aid[] in openpgp-do.c has serial number 00000001.
 It would be good to generate (random) number at compile time.
diff --git a/src/usb_desc.c b/src/usb_desc.c
index 1532711..7250547 100644
--- a/src/usb_desc.c
+++ b/src/usb_desc.c
@@ -207,7 +207,7 @@ static const uint8_t gnukStringSerial[] = {
   8*2+2,			/* bLength */
   USB_STRING_DESCRIPTOR_TYPE,	/* bDescriptorType */
   '2', 0, '0', 0, '1', 0, '0', 0,
-  '0', 0, '9', 0, '1', 0, '0', 0
+  '1', 0, '0', 0, '2', 0, '2', 0
 };
 
 const ONE_DESCRIPTOR Device_Descriptor = {
diff --git a/src/usb_prop.c b/src/usb_prop.c
index e488fac..9949359 100644
--- a/src/usb_prop.c
+++ b/src/usb_prop.c
@@ -39,11 +39,6 @@
 static void
 gnuk_device_init (void)
 {
-  /*
-   * Update the serial number string descriptor (if needed)
-   */
-  Get_SerialNum ();
-
   pInformation->Current_Configuration = 0;
 
   /* Connect the device */