diff --git a/NEWS b/NEWS
index 42934d35e4afb8a260d8e65195d42b09394afd81..8d8be0ebf14ee3045378f80021ab6af774bd0af1 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ documents those changes that are of interest to users and admins.
     process of being powered up. Patch from Andriy Grytsenko.
  -- Change maximum batch script size from 128k to 4M.
  -- Get slurmd -f option working. Patch from Andriy Grytsenko.
+ -- Fix for linking problem on OSX. Patch from Jon Bringhurst, LANL.
 
 * Changes in SLURM 2.2.5
 ========================
diff --git a/doc/html/quickstart_admin.shtml b/doc/html/quickstart_admin.shtml
index 6a7c7882616e94d254281740bbe82322a30c3ce5..c92429cf00fa0dd560bb16fb18e6015366b2a5e8 100644
--- a/doc/html/quickstart_admin.shtml
+++ b/doc/html/quickstart_admin.shtml
@@ -634,6 +634,10 @@ Slurmctld(primary/backup) at adevi/adevj are UP/UP
 adev0: scontrol shutdown
 </pre> <p class="footer"><a href="#top">top</a></p>
 
+<h2>OS X, Darwin</h2>
+<p>Build using the following execute line:<br>
+sh configure && MACOSX_DEPLOYMENT_TARGET=10.5 make all</p>
+
 <h2>Testing</h2>
 <p>An extensive test suite is available within the SLURM distribution
 in <i>testsuite/expect</i>.
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index f1ced0d8125d074d794fb5cce763629018c2e189..1232adec853c9c427ceffd9f344a7c65ba0c89e3 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -25,6 +25,7 @@ Linux NetworX and many other contributors.
 <li>Anton Blanchard (Samba)</li>
 <li>Janne Blomqvist (Aalto University, Finland)</li>
 <li>David Bremer (LLNL)</li>
+<li>Jon Bringhurst (LANL)</li>
 <li>Bill Brophy (Bull)</li>
 <li>Hongjia Cao (National University of Defense Techonogy, China)</li>
 <li>Daniel Christians (HP)</li>
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index 5cb6025cdd0607720372099a21a4cd0ae15dab37..3e24b4b04af9737c9a15b867b26fd0360c15c2e1 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -2046,7 +2046,7 @@ inline void slurm_free_shares_response_msg(shares_response_msg_t *msg)
 	}
 }
 
-inline void slurm_destroy_priority_factors_object(void *object)
+void slurm_destroy_priority_factors_object(void *object)
 {
 	priority_factors_object_t *obj_ptr =
 		(priority_factors_object_t *)object;
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index e0e5bb14c8cfdefaeecfeef496844df836b82705..94ba9e28b3d8c3d231593a96c3f419f6007af5a9 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -952,7 +952,7 @@ inline void slurm_free_set_debug_level_msg(set_debug_level_msg_t *msg);
 inline void slurm_destroy_association_shares_object(void *object);
 inline void slurm_free_shares_request_msg(shares_request_msg_t *msg);
 inline void slurm_free_shares_response_msg(shares_response_msg_t *msg);
-inline void slurm_destroy_priority_factors_object(void *object);
+extern inline void slurm_destroy_priority_factors_object(void *object);
 inline void slurm_free_priority_factors_request_msg(
 	priority_factors_request_msg_t *msg);
 inline void slurm_free_priority_factors_response_msg(