diff --git a/ChangeLog b/ChangeLog
index 8c19ca1554..5e89c7af85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3576,4 +3576,4 @@
 	  added by Freddie Chopin.
 	* configs/stm32f100_generic:  Support for generic STM32F100RC board
 	  contributed by Freddie Chopin.
-
+	* arch/arm/src/stm32_otgfsdev.c:  Partial fix from Petteri Aimonen.
diff --git a/README.txt b/README.txt
index 02067fc73f..ee7f62588d 100644
--- a/README.txt
+++ b/README.txt
@@ -205,7 +205,8 @@ Instantiating "Canned" Configurations
 
 Where <board-name> is the name of your development board and <config-dir>.
 Configuring NuttX requires only copying three files from the <config-dir>
-to the directly where you installed NuttX (TOPDIR):
+to the directory where you installed NuttX (TOPDIR) (and sometimes one
+additional file to the directory the NuttX application package (APPSDIR)):
 
   Copy configs/<board-name>/<config-dir>/Make.def to ${TOPDIR}/Make.defs
 
@@ -227,6 +228,14 @@ to the directly where you installed NuttX (TOPDIR):
     included in the build and what is not.  This file is also used
     to generate a C configuration header at include/nuttx/config.h.
 
+  Copy configs/<board-name>/<config-dir>/appconfig to ${APPSDIR}/.config
+
+    The appconfig file describes the applications that need to be
+    built in the appliction directory (APPSDIR).  Not all configurations
+    have an appconfig file.  This file is deprecated and will not be
+    used with new defconfig files produced with the mconf configuration
+    tool.
+
 General information about configuring NuttX can be found in:
 
   ${TOPDIR}/configs/README.txt
diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c
index 461d500ad1..2d6ca9831c 100644
--- a/arch/arm/src/stm32/stm32_otgfsdev.c
+++ b/arch/arm/src/stm32/stm32_otgfsdev.c
@@ -3900,7 +3900,7 @@ static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
  * Name: stm32_epin_disable
  *
  * Description:
- *   Diable an IN endpoint will no longer be used
+ *   Disable an IN endpoint when it will no longer be used
  *
  *******************************************************************************/
 
@@ -3912,6 +3912,17 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
 
   usbtrace(TRACE_EPDISABLE, privep->epphy);
 
+  /* After USB reset, the endpoint will already be deactivated by the
+   * hardware. Trying to disable again will just hang in the wait.
+   */
+
+  regaddr = STM32_OTGFS_DIEPCTL(privep->epphy);
+  regval  = stm32_getreg(regaddr);
+  if ((regval & OTGFS_DIEPCTL_USBAEP) == 0)
+    {
+      return;
+    }
+
   /* Make sure that there is no pending IPEPNE interrupt (because we are
    * to poll this bit below).
    */
diff --git a/drivers/lcd/ug-9664hswag01.c b/drivers/lcd/ug-9664hswag01.c
index e0e8e8e3a0..aae21d648e 100644
--- a/drivers/lcd/ug-9664hswag01.c
+++ b/drivers/lcd/ug-9664hswag01.c
@@ -182,7 +182,7 @@
 #define UG_BPP          1
 #define UG_COLORFMT     FB_FMT_Y1
 
-/* Bytes per logical row andactual device row */
+/* Bytes per logical row and actual device row */
 
 #define UG_XSTRIDE      (UG_XRES >> 3) /* Pixels arrange "horizontally for user" */
 #define UG_YSTRIDE      (UG_YRES >> 3) /* But actual device arrangement is "vertical" */