diff --git a/README.md b/README.md
index 6e1ce46b..7ba56bf7 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,13 @@ On Alpine Linux (testing repository) do:
 On Gentoo Linux do:
 
     $ emerge --ask media-sound/snapcast
-    
+
+On Archlinux, snapcast is available through the AUR.  To install, use your favorite AUR helper, or do:
+
+    $ git clone https://aur.archlinux.org/snapcast
+    $ cd snapcast
+    $ makepkg -si
+
 SnapOS
 ------
 For the brave of you, there is a guide with buildfiles available to build [SnapOS](https://github.com/badaix/snapos), a small and fast-booting OS to run Snapcast, comming in two flavors: [Buildroot](https://github.com/badaix/snapos/blob/master/buildroot-external/README.md) based, or [OpenWrt](https://github.com/badaix/snapos/tree/master/openwrt) based. Please note that there are no pre-build firmware packages available.
diff --git a/client/Makefile b/client/Makefile
index 78734367..b5641676 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -35,7 +35,7 @@ DEBUG=-O3
 
 
 CXXFLAGS += $(ADD_CFLAGS) -std=c++0x -Wall -Wextra -Wpedantic -Wno-unused-function $(DEBUG) -DBOOST_ERROR_CODE_HEADER_ONLY -DHAS_FLAC -DHAS_OGG -DVERSION=\"$(VERSION)\" -I. -I.. -I../common
-LDFLAGS   = $(ADD_LDFLAGS) -logg -lFLAC
+LDFLAGS  += $(ADD_LDFLAGS) -logg -lFLAC
 OBJ       = snapclient.o stream.o client_connection.o time_provider.o player/player.o decoder/pcm_decoder.o decoder/ogg_decoder.o decoder/flac_decoder.o controller.o ../common/sample_format.o
 
 
diff --git a/doc/build.md b/doc/build.md
index e7e901a4..e934efab 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -35,8 +35,8 @@ Compilation requires gcc 4.8 or higher, so it's highly recommended to use Debian
 For Arch derivates:
 
     $ sudo pacman -S base-devel
-    $ sudo pacman -S alsa-lib avahi libvorbis flac alsa-utils
-    
+    $ sudo pacman -S alsa-lib avahi libvorbis flac alsa-utils boost
+
 For Fedora (and probably RHEL, CentOS & Scientific Linux, but untested):
 
     $ sudo dnf install @development-tools
diff --git a/server/Makefile b/server/Makefile
index ad08813a..e303a245 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -36,7 +36,7 @@ SANITIZE=
 #-fsanitize=thread
 
 CXXFLAGS += $(ADD_CFLAGS) $(SANITIZE) -std=c++14 -Wall -Wextra -Wpedantic -Wno-unused-function $(DEBUG) -DBOOST_ERROR_CODE_HEADER_ONLY -DHAS_FLAC -DHAS_OGG -DHAS_VORBIS -DHAS_VORBIS_ENC -DVERSION=\"$(VERSION)\" -I. -I.. -I../common
-LDFLAGS   = $(ADD_LDFLAGS) $(SANITIZE) -lvorbis -lvorbisenc -logg -lFLAC 
+LDFLAGS  += $(ADD_LDFLAGS) $(SANITIZE) -lvorbis -lvorbisenc -logg -lFLAC 
 OBJ       = snapserver.o config.o control_server.o control_session_tcp.o control_session_http.o stream_server.o stream_session.o streamreader/stream_uri.o streamreader/base64.o streamreader/stream_manager.o streamreader/pcm_stream.o streamreader/pipe_stream.o streamreader/file_stream.o streamreader/process_stream.o streamreader/airplay_stream.o streamreader/librespot_stream.o streamreader/watchdog.o encoder/encoder_factory.o encoder/flac_encoder.o encoder/pcm_encoder.o encoder/ogg_encoder.o ../common/sample_format.o
 
 ifneq (,$(TARGET))