diff --git a/ChangeLog b/ChangeLog
index fd906065d3..e992e4f780 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5542,8 +5542,10 @@
 	* arch/arm/src/sama5/chip/sam_emac.h and sam_gmac.h:  Register
 	  definition files for the SAMA5 EMAC and GMAC peripherals
 	  (incomplete on the initial commit) (2013-9-12).
-	* arch/arm/src/stm32/stm32_can.c:  Patch provided by Lorenz
-	  Meier (2013-9-13).
-
-
+	* arch/arm/src/stm32/stm32_can.c:  Make filter register accessible
+	  for CAN1 and CAN2. Patch provided by Lorenz Meier (2013-9-13).
+	* nuttx/include/nuttx/usb/cdcacm.h:  Fix backward conditional
+	  compilation in the CDC/ACM driver with regard to remote
+	  wakeup and self-powered capabilites.  Provided by Lorenz Meier
+	  (2013-9-13)
 
diff --git a/include/nuttx/usb/cdcacm.h b/include/nuttx/usb/cdcacm.h
index 165d38fb3e..3987311650 100644
--- a/include/nuttx/usb/cdcacm.h
+++ b/include/nuttx/usb/cdcacm.h
@@ -219,13 +219,13 @@
 
 /* USB Controller */
 
-#ifndef CONFIG_USBDEV_SELFPOWERED
+#ifdef CONFIG_USBDEV_SELFPOWERED
 #  define SELFPOWERED USB_CONFIG_ATTR_SELFPOWER
 #else
 #  define SELFPOWERED (0)
 #endif
 
-#ifndef CONFIG_USBDEV_REMOTEWAKEUP
+#ifdef CONFIG_USBDEV_REMOTEWAKEUP
 #  define REMOTEWAKEUP USB_CONFIG_ATTR_WAKEUP
 #else
 #  define REMOTEWAKEUP (0)