diff --git a/.gitignore b/.gitignore
index 35b8b40d5e..82ae9eeae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-DockerToolbox.pkg
+DockerToolbox*.pkg
 windows/Output/**
 windows/bundle/**
 site/public
diff --git a/osx/Dockerfile b/osx/Dockerfile
index b3b7a727e5..70aab23b78 100644
--- a/osx/Dockerfile
+++ b/osx/Dockerfile
@@ -80,8 +80,6 @@ RUN cd /mpkg/docker.pkg && \
 		-e "s/%DOCKER_NUMBER_OF_FILES%/`find . | wc -l`/g" \
 		-e "s/%DOCKER_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
 		-e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \
-		-e "s/%DOCKER_MACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
-		-e "s/%DOCKER_COMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
 		../PackageInfo /mpkg/Distribution && \
 	cd .. && \
 	rm -rf ./rootfs
@@ -98,7 +96,7 @@ RUN cd /mpkg/dockermachine.pkg && \
 	sed -i \
 		-e "s/%DOCKERMACHINE_NUMBER_OF_FILES%/`find . | wc -l`/g" \
 		-e "s/%DOCKERMACHINE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-		-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_VERSION/g" \
+		-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
 		../PackageInfo /mpkg/Distribution && \
 	cd .. && \
 	rm -rf ./rootfs
@@ -115,7 +113,7 @@ RUN cd /mpkg/dockercompose.pkg && \
 	sed -i \
 		-e "s/%DOCKERCOMPOSE_NUMBER_OF_FILES%/`find . | wc -l`/g" \
 		-e "s/%DOCKERCOMPOSE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-		-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_VERSION/g" \
+		-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
 		../PackageInfo /mpkg/Distribution && \
 	cd .. && \
 	rm -rf ./rootfs
@@ -161,7 +159,7 @@ RUN cd /mpkg/kitematicapp.pkg && \
 	sed -i \
 		-e "s/%KITEMATICAPP_NUMBER_OF_FILES%/`find . | wc -l`/g" \
 		-e "s/%KITEMATICAPP_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-		-e "s/%KITEMATICAPP_VERSION%/$INSTALLER_VERSION/g" \
+		-e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \
 		../PackageInfo /mpkg/Distribution && \
 	cd .. && \
 	rm -rf ./rootfs
@@ -180,6 +178,12 @@ RUN sed -i \
 		/mpkg/Distribution && \
 		sed -i \
 		-e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \
+		-e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \
+		-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
+		-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
+		-e "s/%BOOT2DOCKER_ISO_VERSION%/$BOOT2DOCKER_ISO_VERSION/g" \
+		-e "s/%DOCKERCLIAPP_VERSION%/$INSTALLER_VERSION/g" \
+		-e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \
 		mpkg/Resources/en.lproj/Localizable.strings
 
 # Make DMG rootfs
diff --git a/osx/mpkg/Resources/en.lproj/Localizable.strings b/osx/mpkg/Resources/en.lproj/Localizable.strings
index 50cddd577c..53c7add865 100644
--- a/osx/mpkg/Resources/en.lproj/Localizable.strings
+++ b/osx/mpkg/Resources/en.lproj/Localizable.strings
@@ -1,21 +1,21 @@
 'docker_title' = 'Docker Toolbox';
 
-'choiceDockerCLI_title' = 'Docker';
+'choiceDockerCLI_title' = 'Docker Client %DOCKER_VERSION%';
 'choiceDockerCLI_msg' = 'Installs the Docker client for Mac OS X into /usr/local/bin/';
 
-'choiceDockerMachineCLI_title' = 'Docker Machine';
+'choiceDockerMachineCLI_title' = 'Docker Machine %DOCKERMACHINE_VERSION%';
 'choiceDockerMachineCLI_msg' = 'Installs the Docker Machine binary into /usr/local/bin/';
 
-'choiceDockerComposeCLI_title' = 'Docker Compose';
+'choiceDockerComposeCLI_title' = 'Docker Compose %DOCKERCOMPOSE_VERSION%';
 'choiceDockerComposeCLI_msg' = 'Installs the Docker Compose binary into /usr/local/bin/';
 
-'choiceBoot2DockerISO_title' = 'Boot2Docker ISO';
+'choiceBoot2DockerISO_title' = 'Boot2Docker ISO %BOOT2DOCKER_ISO_VERSION%';
 'choiceBoot2DockerISO_msg' = 'Installs the boot2docker.iso into /usr/local/share/';
 
 'choiceDockerCLIAPP_title' = 'Docker CLI Quick-start applet';
 'choiceDockerCLIAPP_msg' = 'Installs the Docker CLI Quick-start applet into /Applications/';
 
-'choiceKitematicAPP_title' = 'Kitematic';
+'choiceKitematicAPP_title' = 'Kitematic %KITEMATICAPP_VERSION%';
 'choiceKitematicAPP_msg' = 'Installs Kitematic into /Applications/';
 
 'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%';
@@ -29,4 +29,3 @@
 
 'UNSUPPORTED_OS_TLE' = "Unsupported OS version detected!";
 'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox requires Mac OS X 10.6 or later.";
-