diff --git a/Makefile b/Makefile
index 87f4695..c948c79 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 CC?=cc
 CFLAGS?=-O
-LIBS=`[ \`uname\` = "SunOS" ] && echo -lsocket -lnsl`
+LIBS=`[ \`uname\` = "SunOS" ] && echo -lsocket -lnsl -lsendfile`
 
 all: darkhttpd
 
diff --git a/README.md b/README.md
index d6654ab..225d842 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,12 @@ Simply run make:
 make
 ```
 
+If `cc` is not on your `PATH` as an alias to your C compiler, you may need to specify it. For example,
+
+```
+CC=gcc make
+```
+
 ## How to run darkhttpd
 
 Serve /var/www/htdocs on the default port (80 if running as root, else 8080):
diff --git a/darkhttpd.c b/darkhttpd.c
index 8a607ee..afa2220 100644
--- a/darkhttpd.c
+++ b/darkhttpd.c
@@ -381,16 +381,6 @@ static char *xstrdup(const char *src) {
     return dest;
 }
 
-#ifdef __sun /* unimpressed by Solaris */
-static int vasprintf(char **strp, const char *fmt, va_list ap) {
-    char tmp;
-    int result = vsnprintf(&tmp, 1, fmt, ap);
-    *strp = xmalloc(result+1);
-    result = vsnprintf(*strp, result+1, fmt, ap);
-    return result;
-}
-#endif
-
 /* vasprintf() that dies if it fails. */
 static unsigned int xvasprintf(char **ret, const char *format, va_list ap)
     __printflike(2,0);