diff --git a/opal/mca/pmix/pmix2x/pmix/NEWS b/opal/mca/pmix/pmix2x/pmix/NEWS
index 8c1add89935..4c049da61f0 100644
--- a/opal/mca/pmix/pmix2x/pmix/NEWS
+++ b/opal/mca/pmix/pmix2x/pmix/NEWS
@@ -21,11 +21,12 @@ example, a bug might be fixed in the master, and then moved to the
 current release as well as the "stable" bug fix release branch.
 
 
-2.1.3 -- TBD
+2.1.3 -- 23 Aug 2018
 ----------------------
 - Fixed memory corruption bug in event notification
   system due to uninitialized variable
 - Add numeric version definition
+- Transfer all cached data to client dstore upon first connect
 
 
 2.1.2 -- 6 July 2018
diff --git a/opal/mca/pmix/pmix2x/pmix/VERSION b/opal/mca/pmix/pmix2x/pmix/VERSION
index 27af07e5aa5..39c4884b8bf 100644
--- a/opal/mca/pmix/pmix2x/pmix/VERSION
+++ b/opal/mca/pmix/pmix2x/pmix/VERSION
@@ -23,14 +23,14 @@ release=3
 # The only requirement is that it must be entirely printable ASCII
 # characters and have no white space.
 
-greek=rc1
+greek=
 
 # If repo_rev is empty, then the repository version number will be
 # obtained during "make dist" via the "git describe --tags --always"
 # command, or with the date (if "git describe" fails) in the form of
 # "date<date>".
 
-repo_rev=git1b0b577
+repo_rev=git7bc1b6c
 
 # If tarball_version is not empty, it is used as the version string in
 # the tarball filename, regardless of all other versions listed in
@@ -44,7 +44,7 @@ tarball_version=
 
 # The date when this release was created
 
-date="Jul 19, 2018"
+date="Aug 20, 2018"
 
 # The shared library version of each of PMIx's public libraries.
 # These versions are maintained in accordance with the "Library
diff --git a/opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec b/opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec
index 853d15a7427..e7a0730c288 100644
--- a/opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec
+++ b/opal/mca/pmix/pmix2x/pmix/contrib/pmix.spec
@@ -12,7 +12,7 @@
 # Copyright (c) 2006-2016 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      Mellanox Technologies, Inc.
 #                         All rights reserved.
-# Copyright (c) 2015-2017 Intel, Inc. All rights reserved.
+# Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
@@ -192,7 +192,7 @@
 
 Summary: An extended/exascale implementation of PMI
 Name: %{?_name:%{_name}}%{!?_name:pmix}
-Version: 2.1.3rc1
+Version: 2.1.3
 Release: 1%{?dist}
 License: BSD
 Group: Development/Libraries
diff --git a/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c b/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c
index 039a16765e5..065a9bb4bad 100644
--- a/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c
+++ b/opal/mca/pmix/pmix2x/pmix/src/mca/gds/ds12/gds_dstore.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015-2018 Intel, Inc. All rights reserved.
- * Copyright (c) 2016      IBM Corporation.  All rights reserved.
+ * Copyright (c) 2016-2018 IBM Corporation.  All rights reserved.
  * Copyright (c) 2016-2017 Mellanox Technologies, Inc.
  *                         All rights reserved.
  *
@@ -3164,7 +3164,7 @@ static pmix_status_t dstore_register_job_info(struct pmix_peer_t *pr,
     char *msg;
     pmix_status_t rc;
     pmix_proc_t proc;
-    pmix_rank_info_t *rinfo;
+    pmix_rank_t rank;
 
     pmix_output_verbose(2, pmix_gds_base_framework.framework_output,
                         "[%s:%d] gds:dstore:register_job_info for peer [%s:%d]",
@@ -3181,8 +3181,8 @@ static pmix_status_t dstore_register_job_info(struct pmix_peer_t *pr,
             return rc;
         }
 
-        PMIX_LIST_FOREACH(rinfo, &ns->ranks, pmix_rank_info_t) {
-            proc.rank = rinfo->pname.rank;
+        for (rank=0; rank < ns->nprocs; rank++) {
+            proc.rank = rank;
             rc = _store_job_info(&proc);
             if (PMIX_SUCCESS != rc) {
                 PMIX_ERROR_LOG(rc);