diff --git a/ompi/mca/btl/vader/btl_vader_component.c b/ompi/mca/btl/vader/btl_vader_component.c
index 1cb359bcb3..ebf2a44b8f 100644
--- a/ompi/mca/btl/vader/btl_vader_component.c
+++ b/ompi/mca/btl/vader/btl_vader_component.c
@@ -279,8 +279,7 @@ static mca_btl_base_module_t **mca_btl_vader_component_init (int *num_btls,
 
 #if OMPI_BTL_VADER_HAVE_XPMEM
     /* create an xpmem segment for the entire memory space */
-    component->my_seg_id = xpmem_make (0, 0xffffffffffffffffll, XPMEM_PERMIT_MODE,
-                                       (void *)0666);
+    component->my_seg_id = xpmem_make (0, VADER_MAX_ADDRESS, XPMEM_PERMIT_MODE, (void *)0666);
     if (-1 == component->my_seg_id) {
         BTL_VERBOSE(("Could not create xpmem segment"));
         free (btls);
diff --git a/ompi/mca/btl/vader/btl_vader_xpmem.c b/ompi/mca/btl/vader/btl_vader_xpmem.c
index 6d85c4fb30..600dfa1399 100644
--- a/ompi/mca/btl/vader/btl_vader_xpmem.c
+++ b/ompi/mca/btl/vader/btl_vader_xpmem.c
@@ -16,9 +16,6 @@
 
 #if OMPI_BTL_VADER_HAVE_XPMEM
 
-/* largest address we can attach to using xpmem */
-#define VADER_MAX_ADDRESS ((uintptr_t)0x7ffffffff000)
-
 /* look up the remote pointer in the peer rcache and attach if
  * necessary */
 mca_mpool_base_registration_t *vader_get_registation (struct mca_btl_base_endpoint_t *endpoint, void *rem_ptr,
diff --git a/ompi/mca/btl/vader/btl_vader_xpmem.h b/ompi/mca/btl/vader/btl_vader_xpmem.h
index 01a914eb9d..a14fda66ec 100644
--- a/ompi/mca/btl/vader/btl_vader_xpmem.h
+++ b/ompi/mca/btl/vader/btl_vader_xpmem.h
@@ -18,6 +18,9 @@
 /* look up the remote pointer in the peer rcache and attach if
  * necessary */
 
+/* largest address we can attach to using xpmem */
+#define VADER_MAX_ADDRESS ((uintptr_t)0x7ffffffff000ul)
+
 mca_mpool_base_registration_t *vader_get_registation (struct mca_btl_base_endpoint_t *endpoint, void *rem_ptr,
  						      size_t size, int flags, void **local_ptr);