diff --git a/pecoff.c b/pecoff.c
index 08ec4c2..bad11a5 100644
--- a/pecoff.c
+++ b/pecoff.c
@@ -629,7 +629,7 @@ coff_syminfo (struct backtrace_state *state, uintptr_t addr,
   else
     {
       memset (&md, 0, sizeof md);
-      md.backtrace_version = 3;
+      md.backtrace_version = BACKTRACE_MOREDATA_VERSION;
       md.backtrace_data = data;
       mdata = (void *) &md;
     }
diff --git a/unknown.c b/unknown.c
index 80dc19d..1d89c23 100644
--- a/unknown.c
+++ b/unknown.c
@@ -54,7 +54,7 @@ unknown_fileline (struct backtrace_state *state, uintptr_t pc,
       struct backtrace_moredata md;
 
       memset (&md, 0, sizeof md);
-      md.backtrace_version = 3;
+      md.backtrace_version = BACKTRACE_MOREDATA_VERSION;
       md.backtrace_data = data;
       return callback ((void *) &md, pc, NULL, 0, NULL);
     }
diff --git a/xcoff.c b/xcoff.c
index 43f7839..2ed243c 100644
--- a/xcoff.c
+++ b/xcoff.c
@@ -554,7 +554,7 @@ xcoff_syminfo (struct backtrace_state *state ATTRIBUTE_UNUSED, uintptr_t addr,
   else
     {
       memset (&md, 0, sizeof md);
-      md.backtrace_version = 3;
+      md.backtrace_version = BACKTRACE_MOREDATA_VERSION;
       md.backtrace_data = data;
       mdata = (void *) &md;
     }
@@ -825,7 +825,7 @@ xcoff_lookup_pc (struct backtrace_state *state,
       struct backtrace_moredata md;
 
       memset (&md, 0, sizeof md);
-      md.backtrace_version = 3;
+      md.backtrace_version = BACKTRACE_MOREDATA_VERSION;
       md.backtrace_data = data;
       return callback ((void *) &md, pc, filename, lnno, function);
     }
@@ -885,9 +885,9 @@ xcoff_fileline (struct backtrace_state *state, uintptr_t pc,
       struct backtrace_moredata md;
 
       memset (&md, 0, sizeof md);
-      md.backtrace_version = 3;
+      md.backtrace_version = BACKTRACE_MOREDATA_VERSION;
       md.backtrace_data = data;
-      return callback ((void *) data, pc, NULL, 0, NULL);
+      return callback ((void *) &md, pc, NULL, 0, NULL);
     }
 }