diff --git a/content/version.md b/content/version.md
new file mode 100644
index 0000000..5d537e2
--- /dev/null
+++ b/content/version.md
@@ -0,0 +1,9 @@
++++
+date = "2024-08-21T20:58:34+02:00"
+title = "Version Information"
+url = "/version"
++++
+
+Version: VAR_VERSION
+Commit ID: [VAR_COMMIT_ID](VAR_COMMIT_URL)
+Theme Commit ID: [VAR_THEME_COMMIT](VAR_THEME_URL)
diff --git a/hugo.yaml b/hugo.yaml
index e2027aa..f8cde74 100644
--- a/hugo.yaml
+++ b/hugo.yaml
@@ -4,6 +4,11 @@ languageCode: "en-us"
 title: "Bryan Joshua Pedini"
 theme: "hugo-coder"
 
+markup:
+  goldmark:
+    renderer:
+      hardWraps: true
+
 params:
   author: "Bryan Joshua Pedini"
   info: "FullStack Developer - Integration Manager - Cloud/PBX/Network/Docker Specialist - DevOps Enthusiast - Kubernetes/Ceph Apprentice"
diff --git a/makefile b/makefile
index eb40116..a244aa4 100644
--- a/makefile
+++ b/makefile
@@ -6,7 +6,7 @@ prep:
 	git submodule foreach --recursive bash -c "git checkout $$(git remote show origin | grep HEAD | sed 's/.*\: //'); git pull"
 
 build: prep
-	hugo
+	./version.sh
 
 run: prep
 	hugo server
diff --git a/version.sh b/version.sh
new file mode 100755
index 0000000..4eddd61
--- /dev/null
+++ b/version.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -e
+
+# Get version from user
+read -p "Version [latest]: " VERSIONINPUT
+# If version was not provided, use the latest commit short hash as version
+if [ -z ${VERSIONINPUT} ]; then
+  APP_VERSION="latest"
+else
+  APP_VERSION=${VERSIONINPUT}
+fi
+
+# Get project commit id and URL
+COMMIT_ID=$(git log HEAD --oneline | awk '{print $1}' | head -n1)
+COMMIT_URL="$(git remote get-url origin | sed 's/\.git$//g;s/:/\//;s/git@/https:\/\//')/commit/${COMMIT_ID}"
+
+# Get the theme used and its commit id and URL
+THEME=$(cat hugo.yaml | grep "theme:" | awk '{print $2}' | sed 's/"//g')
+pushd themes/${THEME} &>/dev/null
+THEME_COMMIT=$(git log HEAD --oneline | awk '{print $1}' | head -n1)
+THEME_URL="$(git remote get-url origin | sed 's/\.git$//g')/commit/${THEME_COMMIT}"
+popd &>/dev/null
+
+# Create version tag (if provided)
+if [ ! -z ${VERSIONINPUT} ]; then
+  git tag ${APP_VERSION}
+fi
+
+# Build the website
+hugo
+
+# Put the correct version information in the website
+sed -i "s|VAR_VERSION|${APP_VERSION}|" public/version/index.html
+sed -i "s|VAR_COMMIT_ID|${COMMIT_ID}|" public/version/index.html
+sed -i "s|VAR_COMMIT_URL|${COMMIT_URL}|" public/version/index.html
+sed -i "s|VAR_THEME_URL|${THEME_URL}|" public/version/index.html
+sed -i "s|VAR_THEME_COMMIT|${THEME_COMMIT}|" public/version/index.html