--- Makefile.in.orig
+++ Makefile.in
@@ -72,10 +72,13 @@
 .SUFFIXES: .o .c
 .SUFFIXES: .o .c
 
-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
+MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
 mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
 mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
+ifndef WITHOUT_X11
+MAN1 +=	floppyd.1 floppyd_installtest.1
+endif
 MAN1EXT	= 1
 MAN1DIR	= $(DESTDIR)$(mandir)/man${MAN1EXT}
 MAN5	= mtools.5
@@ -132,7 +135,7 @@
 xdf_io.c mkmanifest.c
 
 
-SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh
+SCRIPTS = mcheck mxtar mcomp amuFormat.sh
 
 LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
 mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \
@@ -269,11 +272,11 @@
 install-scripts: $(DESTDIR)$(bindir)/mtools
 	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	@for j in $(SCRIPTS) ; do \
-		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
+		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \
 		echo $(DESTDIR)$(bindir)/$$j ; \
 	done
-	rm -f $(DESTDIR)$(bindir)/lz
-	$(LN_S) uz $(DESTDIR)$(bindir)/lz
+	#rm -f $(DESTDIR)$(bindir)/lz
+	#$(LN_S) uz $(DESTDIR)$(bindir)/lz
 
 install-man:
 	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)