diff --git a/src/version.c b/src/version.c
index 0ab1d8249..099cecb6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,7 +44,9 @@ const char *NetHack_git_sha
 #if !defined(CROSSCOMPILE) || (defined(CROSSCOMPILE) && defined(CROSSCOMPILE_HOST))
                 = NETHACK_GIT_SHA
 #else
-                = NETHACK_HOST_GIT_SHA
+#ifdef NETHACK_HOST_GIT_SHA
+		= NETHACK_HOST_GIT_SHA
+#endif
 #endif
 ;
 #endif
@@ -54,8 +56,10 @@ const char *NetHack_git_branch
 #if !defined(CROSSCOMPILE) || (defined(CROSSCOMPILE) && defined(CROSSCOMPILE_HOST))
                 = NETHACK_GIT_BRANCH
 #else
+#ifdef NETHACK_HOST_GIT_BRANCH
                 = NETHACK_HOST_GIT_BRANCH
 #endif
+#endif
 ;
 #endif
 
diff --git a/sys/unix/Makefile.dat b/sys/unix/Makefile.dat
index bbc093ac4..48d50b77c 100644
--- a/sys/unix/Makefile.dat
+++ b/sys/unix/Makefile.dat
@@ -9,7 +9,7 @@ NHSROOT=..
 # SHELL=E:/GEMINI2/MUPFEL.TTP
 # UUDECODE=uudecode
 
-VARDAT = bogusmon data engrave epitaph rumors quest.lua oracles options
+VARDAT = bogusmon data engrave epitaph rumors oracles options
 
 all:	$(VARDAT) spec_levs quest_levs