diff --git a/ChangeLog b/ChangeLog
index eeac48ce5d..7a91f015bc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11199,4 +11199,6 @@
 	  to the SAMV7 (2015-12-02).
 	* arm/arm/src/samv7/sam_tickless.c:  Port the SAMA5/SAM4CM tickless
 	  logic to the SAMV7 (2015-12-02).
-
+	* fs/semaphore: Named semaphores:  Back out "fix" of 2015-10-22.  It was
+	  correct before.  The change of 2015-10-22 probably broke named
+	  semaphores (2015-12-02).
diff --git a/arch b/arch
index eb10f4be29..cbda8e191e 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit eb10f4be2942467023c3ebaaf6165712df0b0611
+Subproject commit cbda8e191eec3c4b5ebe5da531e9d34600beb8a7