diff --git a/src/tools/entab/Makefile b/src/tools/entab/Makefile
index d56accb704bc8b169a97898363414d0aba0db83a..64697a5d700df51af3d26ade2a19aa1884842758 100644
--- a/src/tools/entab/Makefile
+++ b/src/tools/entab/Makefile
@@ -23,7 +23,7 @@ clean:
 install:
 	make clean
 	make CFLAGS=-O
-	install -s -o bin -g bin $(TARGET) $(BINDIR)
+	install -s $(TARGET) $(BINDIR)
 	rm -f $(BINDIR)/detab
-	ln /usr/local/bin/$(TARGET) $(BINDIR)/detab
+	ln $(BINDIR)/$(TARGET) $(BINDIR)/detab
 
diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c
index 20a40231eaf7da9e61c50788cd4b46065b2b39dd..af55fa9c2d5392c899adf60b3d519ff7be11a693 100644
--- a/src/tools/entab/halt.c
+++ b/src/tools/entab/halt.c
@@ -2,7 +2,7 @@
 **
 **		halt.c
 **
-** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.9 2006/03/11 04:38:41 momjian Exp $
+** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.10 2006/07/11 21:21:59 alvherre Exp $
 **
 **		This is used to print out error messages and exit
 */
@@ -10,6 +10,7 @@
 #include <stdarg.h>
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>