diff --git a/eslint.config.js b/eslint.config.js
index 15ece5f..9baab19 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -14,7 +14,11 @@ export default defineConfig([
       reactRefresh.configs.vite,
     ],
     languageOptions: {
-      globals: globals.browser,
+      globals: {
+        ...globals.browser,
+        __BUILD_SHA__: 'readonly',
+        __BUILD_TIME__: 'readonly',
+      },
       parserOptions: { ecmaFeatures: { jsx: true } },
     },
     rules: {
diff --git a/src/App.jsx b/src/App.jsx
index 19df4c9..2c263d3 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -2,6 +2,7 @@ import { Routes, Route, Navigate, Link } from 'react-router-dom'
 import { BookOpen, CheckSquare, LayoutDashboard, Trophy, Settings, LogOut } from 'lucide-react'
 import { useApp } from './store/AppContext'
 import Mark from './components/ui/Mark'
+import BuildStamp from './components/ui/BuildStamp'
 import ChatLauncher from './components/chat/ChatLauncher'
 
 import Login from './pages/Login'
@@ -88,14 +89,17 @@ function App() {
   if (state.isLoading) return <div className="p-8 flex items-center justify-center min-h-screen">Loading application...</div>
 
   return (
-    <Routes>
-      <Route path="/login" element={<Login />} />
-      <Route path="/" element={<ProtectedRoute><Dashboard /></ProtectedRoute>} />
-      <Route path="/learn" element={<ProtectedRoute><Leren /></ProtectedRoute>} />
-      <Route path="/test" element={<ProtectedRoute><Testen /></ProtectedRoute>} />
-      <Route path="/leaderboard" element={<ProtectedRoute><Leaderboard /></ProtectedRoute>} />
-      <Route path="/admin/*" element={<ProtectedRoute requireAdmin={true}><Admin /></ProtectedRoute>} />
-    </Routes>
+    <>
+      <Routes>
+        <Route path="/login" element={<Login />} />
+        <Route path="/" element={<ProtectedRoute><Dashboard /></ProtectedRoute>} />
+        <Route path="/learn" element={<ProtectedRoute><Leren /></ProtectedRoute>} />
+        <Route path="/test" element={<ProtectedRoute><Testen /></ProtectedRoute>} />
+        <Route path="/leaderboard" element={<ProtectedRoute><Leaderboard /></ProtectedRoute>} />
+        <Route path="/admin/*" element={<ProtectedRoute requireAdmin={true}><Admin /></ProtectedRoute>} />
+      </Routes>
+      <BuildStamp />
+    </>
   )
 }
 
diff --git a/src/components/ui/BuildStamp.jsx b/src/components/ui/BuildStamp.jsx
new file mode 100644
index 0000000..3437d4c
--- /dev/null
+++ b/src/components/ui/BuildStamp.jsx
@@ -0,0 +1,19 @@
+const sha = typeof __BUILD_SHA__ === 'string' ? __BUILD_SHA__ : 'dev';
+const time = typeof __BUILD_TIME__ === 'string' ? __BUILD_TIME__ : new Date().toISOString();
+
+const formatted = (() => {
+  const d = new Date(time);
+  if (Number.isNaN(d.getTime())) return time;
+  return d.toLocaleString('nl-NL', { dateStyle: 'short', timeStyle: 'short' });
+})();
+
+const BuildStamp = () => (
+  <div
+    className="hidden md:block fixed bottom-1 right-2 text-[10px] font-mono text-fg-muted/60 z-40 pointer-events-none select-none"
+    title={`Build ${sha} at ${time}`}
+  >
+    v{sha} · {formatted}
+  </div>
+);
+
+export default BuildStamp;
diff --git a/vite.config.js b/vite.config.js
index 7a446ee..5537728 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,9 +1,24 @@
 import { defineConfig } from 'vite'
+import { execSync } from 'node:child_process'
 import react from '@vitejs/plugin-react'
 import tailwindcss from '@tailwindcss/vite'
 
+function getBuildSha() {
+  try {
+    return execSync('git rev-parse --short HEAD', { stdio: ['ignore', 'pipe', 'ignore'] })
+      .toString()
+      .trim()
+  } catch {
+    return 'unknown'
+  }
+}
+
 // https://vite.dev/config/
 export default defineConfig({
+  define: {
+    __BUILD_SHA__: JSON.stringify(getBuildSha()),
+    __BUILD_TIME__: JSON.stringify(new Date().toISOString()),
+  },
   plugins: [react(), tailwindcss()],
   server: {
     proxy: {