diff --git a/Makefile b/Makefile
index c6084a0..f9637b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
-LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
-CC=gcc
+CFLAGS?=-O2 -g -Wall -W $(shell pkg-config --cflags librtlsdr)
+LDLIBS+=$(shell pkg-config --libs librtlsdr) -lpthread -lm
+CC?=gcc
 PROGNAME=dump1090
 
 all: dump1090
@@ -9,7 +9,7 @@ all: dump1090
 	$(CC) $(CFLAGS) -c $<
 
 dump1090: dump1090.o anet.o
-	$(CC) -g -o dump1090 dump1090.o anet.o $(LIBS)
+	$(CC) -g -o dump1090 dump1090.o anet.o $(LDFLAGS) $(LDLIBS)
 
 clean:
 	rm -f *.o dump1090
diff --git a/README.md b/README.md
index 89314cb..eddfbbb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ The main features are:
 * Interactive command-line-interfae mode where aircrafts currently detected
   are shown as a list refreshing as more data arrives.
 * CPR coordinates decoding and track calculation from velocity.
-* TCP server streaming and recceiving raw data to/from connected clients
+* TCP server streaming and receiving raw data to/from connected clients
   (using --net).
 
 While from time to time I still add / fix stuff in my fork, I target
@@ -53,7 +53,7 @@ with your browser to http://localhost:8080 to see live traffic:
 
     ./dump1090 --interactive --net
 
-In iteractive mode it is possible to have a less information dense but more
+In interactive mode it is possible to have a less information dense but more
 "arcade style" output, where the screen is refreshed every second displaying
 all the recently seen aircrafts with some additional information such as
 altitude and flight number, extracted from the received Mode S packets.
@@ -186,7 +186,7 @@ away from me.
 If you are interested in a more serious antenna check the following
 resources:
 
-* http://gnuradio.org/redmine/attachments/download/246/06-foster-adsb.pdf
+* http://gnuradio.org/data/grcon11/06-foster-adsb.pdf
 * http://www.lll.lu/~edward/edward/adsb/antenna/ADSBantenna.html
 * http://modesbeast.com/pix/adsb-ant-drawing.gif
 
diff --git a/dump1090.c b/dump1090.c
index 94bfc1e..6b25576 100644
--- a/dump1090.c
+++ b/dump1090.c
@@ -2268,6 +2268,7 @@ int handleHTTPRequest(struct client *c) {
         "Content-Type: %s\r\n"
         "Connection: %s\r\n"
         "Content-Length: %d\r\n"
+        "Access-Control-Allow-Origin: *\r\n"
         "\r\n",
         ctype,
         keepalive ? "keep-alive" : "close",