diff --git a/configure.ac b/configure.ac
index 29b31973..24c4fce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,8 @@ AC_CHECK_HEADER(vorbis/vorbisenc.h,, [have_vorbisenc=no])
 AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbisenc"], [have_vorbisenc=no])
 AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"])
 
+AC_SUBST(VORBIS_LIBS)
+
 #
 # libVNCServer
 #
@@ -103,6 +105,8 @@ VNC_LIBS=
 AC_CHECK_LIB([vncclient], [rfbInitClient], [VNC_LIBS="$VNC_LIBS -lvncclient"], [have_libvncserver=no])
 AM_CONDITIONAL([ENABLE_VNC], [test "x${have_libvncserver}" = "xyes"])
 
+AC_SUBST(VNC_LIBS)
+
 #
 # FreeRDP
 #
@@ -117,6 +121,8 @@ AC_CHECK_LIB([freerdp-utils],    [xzalloc], [RDP_LIBS="$RDP_LIBS -lfreerdp-utils
 AC_CHECK_LIB([freerdp-codec],    [freerdp_image_convert], [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"], [have_freerdp=no])
 AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
 
+AC_SUBST(RDP_LIBS)
+
 #
 # libssh
 #
@@ -129,6 +135,8 @@ PKG_CHECK_MODULES([PANGO], pango);
 PKG_CHECK_MODULES([PANGOCAIRO], pangocairo);
 AM_CONDITIONAL([ENABLE_SSH], [test "x${have_libssh}" = "xyes"])
 
+AC_SUBST(SSH_LIBS)
+
 AC_CONFIG_FILES([Makefile
                  tests/Makefile
                  src/libguac/Makefile
diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am
index 30dabedc..7ddad6f6 100644
--- a/src/guacd/Makefile.am
+++ b/src/guacd/Makefile.am
@@ -37,7 +37,7 @@
 AUTOMAKE_OPTIONS = foreign 
 initdir = @init_dir@
 
-AM_CFLAGS = -Werror -Wall -pedantic $(LIBGUAC_INCLUDE)
+AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@
 
 sbin_PROGRAMS = guacd
 init_SCRIPTS = init.d/guacd
@@ -45,7 +45,7 @@ man_MANS = man/guacd.8
 
 noinst_HEADERS = client.h log.h
 guacd_SOURCES  = daemon.c client.c log.c
-guacd_LDADD    = $(LIBGUAC_LTLIB)
+guacd_LDADD    = @LIBGUAC_LTLIB@
 
 EXTRA_DIST = init.d/guacd.in man/guacd.8
 CLEANFILES = $(init_SCRIPTS)
diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am
index fc97f376..088801e1 100644
--- a/src/libguac/Makefile.am
+++ b/src/libguac/Makefile.am
@@ -37,7 +37,6 @@
 AUTOMAKE_OPTIONS = foreign 
 ACLOCAL_AMFLAGS = -I m4
 AM_CFLAGS = -Werror -Wall -pedantic -Iguacamole
-AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
 
 libguacincdir = $(includedir)/guacamole
 libguacinc_HEADERS =         \
@@ -75,5 +74,5 @@ libguac_la_SOURCES =  \
     unicode.c
 
 lib_LTLIBRARIES = libguac.la
-libguac_la_LDFLAGS = -version-info 4:0:0
+libguac_la_LDFLAGS = -version-info 4:0:0 @PTHREAD_LIBS@
 
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index ed67e639..fd06c71c 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -37,8 +37,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Werror -Wall -Iinclude $(LIBGUAC_INCLUDE)
-AM_LDFLAGS = $(RDP_LIBS) $(VORBIS_LIBS) $(PTHREAD_LIBS)
+AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@
 
 lib_LTLIBRARIES = libguac-client-rdp.la
 freerdp_LTLIBRARIES = guac_rdpsnd.la
@@ -88,11 +87,11 @@ if ENABLE_OGG
     noinst_HEADERS += ogg_encoder.h
 endif
 
-libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0
-guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared
+libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@
+guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@
 
-libguac_client_rdp_la_LIBADD = $(LIBGUAC_LTLIB)
-guac_rdpsnd_la_LIBADD = $(LIBGUAC_LTLIB)
+libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@
+guac_rdpsnd_la_LIBADD = @LIBGUAC_LTLIB@
 
 freerdpdir = ${libdir}/freerdp
 
diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am
index beb77efe..cd6b6c3d 100644
--- a/src/protocols/ssh/Makefile.am
+++ b/src/protocols/ssh/Makefile.am
@@ -37,7 +37,6 @@
 AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
-AM_LDFLAGS = $(SSH_LIBS) $(PTHREAD_LIBS)
 
 lib_LTLIBRARIES = libguac-client-ssh.la
 
@@ -71,7 +70,7 @@ noinst_HEADERS =                \
     terminal_handlers.h         \
     types.h
 
-libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ $(LIBGUAC_INCLUDE)
-libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ $(LIBGUAC_LTLIB)
-libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0
+libguac_client_ssh_la_CFLAGS = -Werror -Wall -pedantic -Iinclude @PANGO_CFLAGS@ @PANGOCAIRO_CFLAGS@ @LIBGUAC_INCLUDE@
+libguac_client_ssh_la_LIBADD = @PANGO_LIBS@ @PANGOCAIRO_LIBS@ @LIBGUAC_LTLIB@
+libguac_client_ssh_la_LDFLAGS = -version-info 0:0:0 @SSH_LIBS@ @PTHREAD_LIBS@
 
diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am
index acf4f93f..4c4f4d18 100644
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
@@ -37,14 +37,13 @@
 AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Werror -Wall -pedantic -Iinclude $(LIBGUAC_INCLUDE)
-AM_LDFLAGS = $(VNC_LIBS)
+AM_CFLAGS = -Werror -Wall -pedantic -Iinclude @LIBGUAC_INCLUDE@
 
 lib_LTLIBRARIES = libguac-client-vnc.la
 
 libguac_client_vnc_la_SOURCES = client.c vnc_handlers.c guac_handlers.c convert.c
 noinst_HEADERS = client.h vnc_handlers.h guac_handlers.h convert.h
 
-libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0
-libguac_client_vnc_la_LIBADD  = $(LIBGUAC_LTLIB)
+libguac_client_vnc_la_LDFLAGS = -version-info 0:0:0 @VNC_LIBS@
+libguac_client_vnc_la_LIBADD  = @LIBGUAC_LTLIB@
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ba5fb76a..1ef77525 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,7 @@
 
 AUTOMAKE_OPTIONS = foreign 
 ACLOCAL_AMFLAGS = -I m4
-AM_CFLAGS = -Werror -Wall -pedantic $(LIBGUAC_INCLUDE)
+AM_CFLAGS = -Werror -Wall -pedantic @LIBGUAC_INCLUDE@
 
 TESTS = test_libguac
 check_PROGRAMS = test_libguac
@@ -58,5 +58,5 @@ test_libguac_SOURCES =           \
 	util/util_suite.c            \
 	util/guac_pool.c
 
-test_libguac_LDADD = $(LIBGUAC_LTLIB) @CUNIT_LIBS@
+test_libguac_LDADD = @LIBGUAC_LTLIB@ @CUNIT_LIBS@