diff --git a/BasiliskII/src/Unix/BasiliskII.1 b/BasiliskII/src/Unix/BasiliskII.1
index 9b9595f5..db92209f 100644
--- a/BasiliskII/src/Unix/BasiliskII.1
+++ b/BasiliskII/src/Unix/BasiliskII.1
@@ -1,16 +1,22 @@
-.TH BasiliskII 1 "October, 1999" "Version 0.7 (alpha)" "Mac II Emulation"
+.TH BasiliskII 1 "October, 1999"
 .SH NAME
 Basilisk II \- a free, portable Mac II emulator
 .SH SYNOPSIS
 .B BasiliskII
+[\-display
+.IR display-name ]
 .SH DESCRIPTION
 .B Basilisk II
 is an attempt at creating a free, portable 68k Mac emulator.
 For more information, see the included "README" file.
-.SH FILES
-.PD 0
+.SH OPTIONS
 .TP
-.I /usr/share/BasiliskII/keycodes
+.BI "\-display " display-name
+specifies the display to use; see
+.BR X (1)
+.SH FILES
+.TP
+.I @datadir@/BasiliskII/keycodes
 X server keycodes definitions.
 .TP
 .I ~/.basilisk_ii_prefs
@@ -18,7 +24,6 @@ User-specific configuration file.
 .TP
 .I ~/.basilisk_ii_nvram
 Contents of Mac non-volatile RAM.
-.PD 1
 .SH BUGS
 Several. See the included "TODO" file.
 .SH SEE ALSO
diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index b5fdebb4..78006706 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -2,6 +2,7 @@
 
 ## System specific configuration
 @SET_MAKE@
+SHELL = /bin/sh
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -35,8 +36,10 @@ APP = BasiliskII
 
 ## Rules
 .PHONY: modules install uninstall clean distclean depend
+.SUFFIXES:
+.SUFFIXES: .c .cpp .s .o .h
 
-default: $(APP)
+all: $(APP)
 
 OBJ_DIR = obj
 $(OBJ_DIR)::
@@ -59,24 +62,27 @@ modules:
 	cd Linux/NetDriver; make
 
 install: $(APP)
-	$(INSTALL_PROGRAM) $(APP) $(bindir)
-	$(INSTALL_DATA) $(APP).1 $(man1dir)
+	$(INSTALL_PROGRAM) $(APP) $(bindir)/$(APP)
+	-$(INSTALL_DATA) $(APP).1 $(man1dir)/$(APP).1
 	$(INSTALL) -d $(datadir)/$(APP)
-	$(INSTALL_DATA) keycodes $(datadir)/$(APP)
+	$(INSTALL_DATA) keycodes $(datadir)/$(APP)/keycodes
 
 uninstall:
-	-rm -f $(bindir)/$(APP)
-	-rm -f $(man1dir)/$(APP).1
-	-rm -rf $(datadir)/$(APP)
+	rm -f $(bindir)/$(APP)
+	rm -f $(man1dir)/$(APP).1
+	rm -f $(datadir)/$(APP)/keycodes
+	rmdir $(datadir)/$(APP)
 
-clean:
-	-rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
-	-rm -f cpuemu.cpp cpudefs.cpp cputmp.s cpufast*.s cpustbl.cpp cputbl.h
+mostlyclean:
+	rm -f $(APP) $(OBJ_DIR)/* core* *.core *~ *.bak
+
+clean: mostlyclean
+	rm -f cpuemu.cpp cpudefs.cpp cputmp.s cpufast*.s cpustbl.cpp cputbl.h
 
 distclean: clean
-	-rm -rf $(OBJ_DIR)
-	-rm -f Makefile
-	-rm -f config.cache config.log config.status config.h
+	rm -rf $(OBJ_DIR)
+	rm -f Makefile
+	rm -f config.cache config.log config.status config.h
 
 depend dep:
 	makedepend $(CPPFLAGS) -Y. $(SRCS) 2>/dev/null