diff --git a/INSTALL b/INSTALL
index 77e4f13..792d52e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,7 @@
 Short guide to installing proxytunnel
 
-On most modern unix systems, use the normal Makefile
-On MAC OS X, use Makefile.darwin
-If you don't have gnu-getopts, use Makefile.no-gnu-getopts
-On windows/Cygwin, use Makefile.cygwin
-etc etc...
+On most modern unix systems, use the normal Makefile, possibly uncommenting
+the section related to your system (darwin/cygwin/solaris/openbsd)
 
 If you want to enable setproctitle functionality, add a CFLAGS define
 -DSETPROCTITLE (uncomment sample in Makefile)
diff --git a/Makefile b/Makefile
index 87a896b..0fd8ac3 100755
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,8 @@ DATADIR = $(PREFIX)/share
 MANDIR = $(DATADIR)/man
 
 PROGNAME = proxytunnel
+
+# Remove strlcpy/strlcat on (open)bsd/darwin systems
 OBJ = proxytunnel.o	\
 	base64.o	\
 	strlcpy.o	\