diff --git a/buildscripts/version.sh b/buildscripts/version.sh
index 008f825..832f95e 100755
--- a/buildscripts/version.sh
+++ b/buildscripts/version.sh
@@ -18,9 +18,9 @@ fi
 echo "!define VERSIONMAJOR $VERSIONMAJOR" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
 echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
 echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
-echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
+echo "!define I2P_VERSION $I2P_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
 
 mkdir -p "$SCRIPT_DIR"/build
-echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
-echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
+echo "$I2P_VERSION" > "$SCRIPT_DIR"/build/version.txt
+echo "$I2P_VERSION" > "$SCRIPT_DIR"/build/version.txt
 sed 's|!define VERSION||g' "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
diff --git a/i2pversion b/i2pversion
index 1c164a9..4c7b28a 100644
--- a/i2pversion
+++ b/i2pversion
@@ -4,12 +4,14 @@ JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
 I2PFIREFOX_VERSION=1.4.991
 export I2PFIREFOX_VERSION=1.4.991
-# Comment this out to build from an alternate branch or
-# the tip of the master branch.
-VERSIONMAJOR=2
-VERSIONMINOR=4
-VERSIONBUILD=0
+
+export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-])
+VERSIONMAJOR=$(echo "$GITHUB_TAG" | cut -d . -f 1)
+VERSIONMINOR=$(echo "$GITHUB_TAG" | cut -d . -f 2)
+VERSIONBUILD=$(echo "$GITHUB_TAG" | cut -d . -f 3)
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+# Comment this out to build from an alternate branch or
+# the tip of the master branch.
 VERSION=i2p-2.4.0
 export VERSION=i2p-2.4.0
\ No newline at end of file