diff --git a/Scripts/set_build_number.sh b/Scripts/set_build_number.sh
index 77451f6..d857f03 100755
--- a/Scripts/set_build_number.sh
+++ b/Scripts/set_build_number.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 
 git=$(sh /etc/profile; which git)
+date=$(sh /etc/profile; which date)
+
 number_of_commits=$("$git" rev-list HEAD --count)
+date_timestamp=$("$date" +%Y%m%d)
 
 target_plist="$TARGET_BUILD_DIR/$INFOPLIST_PATH"
 dsym_plist="$DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME/Contents/Info.plist"
 
 for plist in "$target_plist" "$dsym_plist"; do
   if [ -f "$plist" ]; then
+    echo $date_timestamp
     /usr/libexec/PlistBuddy -c "Set :CFBundleVersion ${number_of_commits}" "$plist"
+    /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString 0.0.${date_timestamp}" "$plist"
+
   fi
 done
 
@@ -17,7 +23,8 @@ settings_root_plist="$TARGET_BUILD_DIR/WireGuard.app/Settings.bundle/Root.plist"
 if [ -f "$settings_root_plist" ]; then
   settingsVersion="`agvtool what-marketing-version -terse1`(${number_of_commits})"
   /usr/libexec/PlistBuddy -c "Set :PreferenceSpecifiers:1:DefaultValue $settingsVersion" "$settings_root_plist"
+  /usr/libexec/PlistBuddy -c "Set :PreferenceSpecifiers:1:DefaultValue 0.0.$date_timestamp" "$settings_root_plist"
 else
   echo "Could not find: $settings_root_plist"
   exit 1
-fi
\ No newline at end of file
+fi
diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
index 86acc21..1542ffa 100644
--- a/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -534,7 +534,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = $SRCROOT/Scripts/set_build_number.sh;
+			shellScript = "$SRCROOT/Scripts/set_build_number.sh\n";
 		};
 		6F743EFD0F63EA8C605CE349 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;