diff --git a/configure-libafs.in b/configure-libafs.in
index 0cde5b0cb1..69bc25de44 100644
--- a/configure-libafs.in
+++ b/configure-libafs.in
@@ -1,8 +1,11 @@
AC_INIT(src/libafs/Makefile.common.in)
AM_INIT_AUTOMAKE(openafs-libafs,1.5.25)
AC_CONFIG_HEADER(src/config/afsconfig.h)
-define(OPENAFS_CONFIGURE_LIBAFS)
+MACOS_VERSION=1.5.25
+AC_SUBST(MACOS_VERSION)
+
+define(OPENAFS_CONFIGURE_LIBAFS)
AC_PROG_CC
OPENAFS_CONFIGURE_COMMON
diff --git a/configure.in b/configure.in
index 999d85f4d5..41e84230b3 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,9 @@
AC_INIT(src/config/stds.h)
AM_INIT_AUTOMAKE(openafs,1.5.25)
AC_CONFIG_HEADER(src/config/afsconfig.h)
+MACOS_VERSION=1.5.25
+
+AC_SUBST(MACOS_VERSION)
AC_PROG_CC
OPENAFS_CONFIGURE_COMMON
@@ -79,6 +82,8 @@ src/lwp/test/Makefile \
src/mpp/Makefile \
src/null/Makefile \
src/package/Makefile \
+src/packaging/MacOS/OpenAFS.Info.plist \
+src/packaging/MacOS/OpenAFS.info \
src/packaging/RedHat/openafs.spec \
src/pam/Makefile \
src/pinstall/Makefile \
diff --git a/src/libafs/afs.ppc_darwin_12.plist.in b/src/libafs/afs.ppc_darwin_12.plist.in
index 50e5e72d9f..eb1be80c90 100644
--- a/src/libafs/afs.ppc_darwin_12.plist.in
+++ b/src/libafs/afs.ppc_darwin_12.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- @VERSION@
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- @VERSION@
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kernel.bsd
diff --git a/src/libafs/afs.ppc_darwin_13.plist.in b/src/libafs/afs.ppc_darwin_13.plist.in
index 50e5e72d9f..eb1be80c90 100644
--- a/src/libafs/afs.ppc_darwin_13.plist.in
+++ b/src/libafs/afs.ppc_darwin_13.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- @VERSION@
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- @VERSION@
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kernel.bsd
diff --git a/src/libafs/afs.ppc_darwin_14.plist.in b/src/libafs/afs.ppc_darwin_14.plist.in
index 7e4f1bf1ac..eafb931589 100644
--- a/src/libafs/afs.ppc_darwin_14.plist.in
+++ b/src/libafs/afs.ppc_darwin_14.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- @VERSION@
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- @VERSION@
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kernel.bsd
diff --git a/src/libafs/afs.ppc_darwin_60.plist.in b/src/libafs/afs.ppc_darwin_60.plist.in
index 98ab344210..46d02fdcb8 100644
--- a/src/libafs/afs.ppc_darwin_60.plist.in
+++ b/src/libafs/afs.ppc_darwin_60.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- @VERSION@
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- @VERSION@
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kernel.bsd
diff --git a/src/libafs/afs.ppc_darwin_70.plist.in b/src/libafs/afs.ppc_darwin_70.plist.in
index a5334fe376..8fbe490610 100644
--- a/src/libafs/afs.ppc_darwin_70.plist.in
+++ b/src/libafs/afs.ppc_darwin_70.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- 1.5.25
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kernel.bsd
diff --git a/src/libafs/afs.ppc_darwin_80.plist.in b/src/libafs/afs.ppc_darwin_80.plist.in
index eb48495ffc..a1385718c5 100644
--- a/src/libafs/afs.ppc_darwin_80.plist.in
+++ b/src/libafs/afs.ppc_darwin_80.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- 1.5.25
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kpi.bsd
diff --git a/src/libafs/afs.ppc_darwin_90.plist.in b/src/libafs/afs.ppc_darwin_90.plist.in
index eb48495ffc..a1385718c5 100644
--- a/src/libafs/afs.ppc_darwin_90.plist.in
+++ b/src/libafs/afs.ppc_darwin_90.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- 1.5.25
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kpi.bsd
diff --git a/src/libafs/afs.x86_darwin_80.plist.in b/src/libafs/afs.x86_darwin_80.plist.in
index eb48495ffc..a1385718c5 100644
--- a/src/libafs/afs.x86_darwin_80.plist.in
+++ b/src/libafs/afs.x86_darwin_80.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- 1.5.25
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kpi.bsd
diff --git a/src/libafs/afs.x86_darwin_90.plist.in b/src/libafs/afs.x86_darwin_90.plist.in
index eb48495ffc..a1385718c5 100644
--- a/src/libafs/afs.x86_darwin_90.plist.in
+++ b/src/libafs/afs.x86_darwin_90.plist.in
@@ -15,11 +15,11 @@
CFBundlePackageType
KEXT
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
CFBundleSignature
????
CFBundleVersion
- 1.5.25
+ @MACOS_VERSION@
OSBundleLibraries
com.apple.kpi.bsd
diff --git a/src/packaging/MacOS/OpenAFS.Info.plist b/src/packaging/MacOS/OpenAFS.Info.plist.in
similarity index 94%
rename from src/packaging/MacOS/OpenAFS.Info.plist
rename to src/packaging/MacOS/OpenAFS.Info.plist.in
index 13878eda70..bf9751531e 100644
--- a/src/packaging/MacOS/OpenAFS.Info.plist
+++ b/src/packaging/MacOS/OpenAFS.Info.plist.in
@@ -3,13 +3,13 @@
CFBundleGetInfoString
- OpenAFS 1.5.25
+ OpenAFS @MACOS_VERSION@
CFBundleIdentifier
org.openafs.OpenAFS.pkg
CFBundleName
OpenAFS
CFBundleShortVersionString
- 1.5.25
+ @MACOS_VERSION@
IFMajorVersion
1
IFMinorVersion
diff --git a/src/packaging/MacOS/OpenAFS.info b/src/packaging/MacOS/OpenAFS.info.in
similarity index 95%
rename from src/packaging/MacOS/OpenAFS.info
rename to src/packaging/MacOS/OpenAFS.info.in
index abc9a8594c..2977252e1c 100644
--- a/src/packaging/MacOS/OpenAFS.info
+++ b/src/packaging/MacOS/OpenAFS.info.in
@@ -1,5 +1,5 @@
Title OpenAFS
-Version 1.5.25
+Version @VERSION@
Description The OpenAFS distributed filesystem. This package installs an almost-ready-to-run client for OpenAFS. see http://www.openafs.org for more information.
DefaultLocation /
Diskname (null)