diff --git a/Makefile b/Makefile
index 7414befbb04e5f8b427964887534aa9fff971c58..6037dea8b2ec1461a6e219e900e5931a9907fcb6 100644
--- a/Makefile
+++ b/Makefile
@@ -554,7 +554,7 @@ clean: clean-depend
 	$(MAKE) -C stdtime clean
 
 datafiles: all
-	if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ x`id -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
diff --git a/build_tools/make_build_h b/build_tools/make_build_h
index cd6391a8833e77d3eb84a8cf834869f32111c725..a9b04198564c9009d61ad5c8af2d88d42044cca9 100755
--- a/build_tools/make_build_h
+++ b/build_tools/make_build_h
@@ -3,7 +3,7 @@ HOSTNAME=`uname -n`
 KERNEL=`uname -r`
 MACHINE=`uname -m`
 OS=`uname -s`
-USER=`whoami`
+USER=`id -un`
 DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
 cat << END
 /*