diff --git a/library/git-describe.cmake b/library/git-describe.cmake
index 9a22617ad..3fb3095ff 100644
--- a/library/git-describe.cmake
+++ b/library/git-describe.cmake
@@ -1,10 +1,10 @@
-execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --long
+execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=8 --long
     WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
     OUTPUT_VARIABLE DFHACK_GIT_DESCRIPTION)
 execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
     WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
     OUTPUT_VARIABLE DFHACK_GIT_COMMIT)
-execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --exact-match
+execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=8 --exact-match
     WORKING_DIRECTORY "${dfhack_SOURCE_DIR}"
     RESULT_VARIABLE DFHACK_GIT_TAGGED_RESULT
     OUTPUT_QUIET ERROR_QUIET)
diff --git a/scripts b/scripts
index 0e22223f2..95dbacdab 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 0e22223f2dd48314722f9d68ac95e92f059c05a9
+Subproject commit 95dbacdab21ce24dbc25aacc8173d370b099bce9