diff --git a/Packaging/debian/rules b/Packaging/debian/rules
index 2b454f3bc..cfb75bc5a 100755
--- a/Packaging/debian/rules
+++ b/Packaging/debian/rules
@@ -5,16 +5,18 @@
 #export DH_VERBOSE=1
 export COMPILE_FLAGS="-O0"
 export DEB_BUILD_MAINT_OPTIONS = hardening=-all
-export DEB_CFLAGS_MAINT_APPEND  = -Wno-error 
+export DEB_CFLAGS_MAINT_APPEND  = -Wno-error
 export DEB_LDFLAGS_MAINT_APPEND = -Wno-error
 export CXXFLAGS="-DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+GIT_VERSION_DEVILUTIONX ?= $(shell pwd | tail -c 22 | cut -c-5)
+GIT_COMMIT_DEVILUTIONX := $(shell pwd | tail -c 8)
 
 %:
 	dh $@ --buildsystem=cmake --builddirectory=obj-${DEB_HOST_MULTIARCH}
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DNIGHTLY_BUILD=ON #-DSPAWN=ON
+	dh_auto_configure -- -DNIGHTLY_BUILD=ON -DVERSION_NUM=${GIT_VERSION_DEVILUTIONX} -DVERSION_SUFFIX=-${GIT_COMMIT_DEVILUTIONX} #-DSPAWN=ON
 
 override_dh_auto_install:
 	install -pdm755 debian/diablo-data/usr/share/games/diablo/
@@ -27,10 +29,10 @@ override_dh_auto_install:
 	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/32x32/apps/
 	install -pdm755 debian/devilutionx/usr/share/icons/hicolor/48x48/apps/
 	install -pdm755 debian/devilutionx/usr/share/games/diablo/
-	install -Dm664 Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/devilutionx.png 
-	install -Dm664 Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/devilutionx.png 
-	install -Dm664 Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/devilutionx.png 
+	install -Dm664 Packaging/resources/16.png debian/devilutionx/usr/share/icons/hicolor/16x16/apps/devilutionx.png
+	install -Dm664 Packaging/resources/Diablo_32.png debian/devilutionx/usr/share/icons/hicolor/32x32/apps/devilutionx.png
+	install -Dm664 Packaging/resources/Diablo_48.png debian/devilutionx/usr/share/icons/hicolor/48x48/apps/devilutionx.png
 	install -Dm664 Packaging/fedora/devilutionx.desktop debian/devilutionx/usr/share/applications/
 	install -Dm664 Packaging/resources/CharisSILB.ttf debian/devilutionx/usr/share/fonts/truetype/
-	install -Dm755 obj-${DEB_HOST_MULTIARCH}/devilutionx debian/devilutionx/usr/share/games/diablo/ 
+	install -Dm755 obj-${DEB_HOST_MULTIARCH}/devilutionx debian/devilutionx/usr/share/games/diablo/