diff --git a/ChangeLog b/ChangeLog
index b43487d5ab..dc3b3c7321 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11204,4 +11204,7 @@
 	  semaphores (2015-12-02).
 	* arch/arm/src/samv7: Bring programmable clock logic from SAMA5 into
 	  SAMV7 (2015-12-03).
-
+	* arch/arm/src/samv7: Add PCK6 as an optional source for the timer/
+	  counter clock (2015-12-04).
+	* configs/samv7-xult/: If Tickless mode is selected then enable PCK6i
+	  as a timer/counter clock source
diff --git a/arch b/arch
index 12ef9caf3f..d4d2f2f588 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 12ef9caf3f708d62be342a097191fa1741e0464c
+Subproject commit d4d2f2f588ab859dd6b1a73aa41187344f442c20
diff --git a/configs b/configs
index cbfce044c8..ce0b4882db 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit cbfce044c83ea4a720467276ca03bc84efc5fe55
+Subproject commit ce0b4882db75aa011f48541c75149c0f050174c5