diff --git a/CHANGES b/CHANGES
index ceb83dcad5..944496db2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6000.	[bug]		Fix a startup issue on Solaris systems with many
+			(reportedly > 510) CPUs. Thanks to Stacey Marshall from
+			Oracle for deep investigation of the problem. [GL #3563]
+
 5999.	[bug]		rpz-ip rules could be ineffective in some scenarios
 			with CD=1 queries. [GL #3247]
 
diff --git a/bin/named/os.c b/bin/named/os.c
index f413c71a09..e984b4b6d4 100644
--- a/bin/named/os.c
+++ b/bin/named/os.c
@@ -485,13 +485,15 @@ ns_os_uid(void) {
 
 void
 named_os_adjustnofile(void) {
-#if defined(__linux__)
+#if defined(__linux__) || defined(__sun)
 	isc_result_t result;
 	isc_resourcevalue_t newvalue;
 
 	/*
 	 * Linux: max number of open files specified by one thread doesn't seem
 	 * to apply to other threads on Linux.
+	 * Sun: restriction needs to be removed sooner when hundreds of CPUs
+	 * are available.
 	 */
 	newvalue = ISC_RESOURCE_UNLIMITED;
 
@@ -499,7 +501,7 @@ named_os_adjustnofile(void) {
 	if (result != ISC_R_SUCCESS) {
 		named_main_earlywarning("couldn't adjust limit on open files");
 	}
-#endif /* if defined(__linux__) */
+#endif /* if defined(__linux__) || defined(__sun) */
 }
 
 void
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 7c4b175b58..77092bd75a 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -40,4 +40,6 @@ Feature Changes
 Bug Fixes
 ~~~~~~~~~
 
-- None.
+- BIND would fail to start on Solaris-based systems with hundreds of CPUs. This
+  has been fixed. ISC would like to thank Stacey Marshall from Oracle for
+  bringing this problem to our attention. :gl:`#3563`