diff --git a/Makefile b/Makefile
index bd6d302..83c38cc 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,8 @@ checksums: checksums.json
 checksums.json: contrib/checksums.sh $(ALL_RSC)
 	contrib/checksums.sh > $@
 
-commitinfo: global-functions.rsc
-	contrib/commitinfo.sh $< > $<~
-	mv $<~ $<
+commitinfo:
+	contrib/commitinfo.sh
 
 docs: $(HTML)
 
diff --git a/contrib/commitinfo.sh b/contrib/commitinfo.sh
index 21faf9f..6c82465 100755
--- a/contrib/commitinfo.sh
+++ b/contrib/commitinfo.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sed \
+sed -i \
 	-e "/^:global CommitId/c :global CommitId \"${COMMITID:-unknown}\";" \
 	-e "/^:global CommitInfo/c :global CommitInfo \"${COMMITINFO:-unknown}\";" \
-	< "${1}"
+	global-functions.rsc
diff --git a/global-functions.rsc b/global-functions.rsc
index db9eac6..91e8d62 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -1900,11 +1900,10 @@
   }
 }
 
-# add (and fix) global scripts scheduler
-:local OnEvent "/system/script { run global-config; run global-functions; }";
 :if ([ :len [ /system/scheduler/find where name="global-scripts" ] ] = 0) do={
   /system/scheduler/add name="global-scripts" start-time=startup;
 }
+:local OnEvent "/system/script { run global-config; run global-functions; }";
 :if ([ /system/scheduler/get "global-scripts" on-event ] != $OnEvent) do={
   /system/scheduler/set "global-scripts" on-event=$OnEvent;
 }