diff --git a/configure.ac b/configure.ac
index 6635c77e..928c4363 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,11 +528,10 @@ then
 fi
 
 #
-# FreeRDP 2
+# FreeRDP 2 (libfreerdp2, libfreerdp-client2, and libwinpr2)
 #
 
 have_freerdp2=disabled
-RDP_LIBS=
 AC_ARG_WITH([rdp],
             [AS_HELP_STRING([--with-rdp],
                             [support RDP @<:@default=check@:>@])],
@@ -542,22 +541,17 @@ AC_ARG_WITH([rdp],
 if test "x$with_rdp" != "xno"
 then
     have_freerdp2=yes
-
-    # libfreerdp2
-    AC_CHECK_LIB([freerdp2], [freerdp_new],
-                 [RDP_LIBS="$RDP_LIBS -lfreerdp2 -lfreerdp-client2 -lwinpr2"],
-                 [AC_MSG_WARN([
+    PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2],,
+                      [AC_MSG_WARN([
   --------------------------------------------
-   Unable to find libfreerdp2
+   Unable to find FreeRDP (libfreerdp2 / libfreerdp-client2 / libwinpr2)
    RDP will be disabled.
   --------------------------------------------])
-                  have_freerdp2=no])
+                       have_freerdp2=no])
 fi
 
 AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"])
 
-AC_SUBST(RDP_LIBS)
-
 #
 # libssh2
 #
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index d3d0cf08..c22f5288 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -138,7 +138,8 @@ libguac_client_rdp_la_CFLAGS = \
     -Werror -Wall -Iinclude    \
     @COMMON_INCLUDE@           \
     @COMMON_SSH_INCLUDE@       \
-    @LIBGUAC_INCLUDE@
+    @LIBGUAC_INCLUDE@          \
+    @RDP_CFLAGS@
 
 libguac_client_rdp_la_LDFLAGS = \
     -version-info 0:0:0         \
@@ -158,7 +159,8 @@ guacdr_cflags                = \
     -Werror -Wall -Iinclude    \
     @COMMON_INCLUDE@           \
     @COMMON_SSH_INCLUDE@       \
-    @LIBGUAC_INCLUDE@
+    @LIBGUAC_INCLUDE@          \
+    @RDP_CFLAGS@
 
 guacdr_ldflags =                   \
     -module -avoid-version -shared \
@@ -177,7 +179,8 @@ guacai_cflags               =  \
     -Werror -Wall -Iinclude    \
     @COMMON_INCLUDE@           \
     @COMMON_SSH_INCLUDE@       \
-    @LIBGUAC_INCLUDE@
+    @LIBGUAC_INCLUDE@          \
+    @RDP_CFLAGS@
 
 guacai_ldflags =                   \
     -module -avoid-version -shared \
@@ -196,7 +199,8 @@ guacsnd_cflags               = \
     -Werror -Wall -Iinclude    \
     @COMMON_INCLUDE@           \
     @COMMON_SSH_INCLUDE@       \
-    @LIBGUAC_INCLUDE@
+    @LIBGUAC_INCLUDE@          \
+    @RDP_CFLAGS@
 
 guacsnd_ldflags =                  \
     -module -avoid-version -shared \
@@ -215,7 +219,8 @@ guacsvc_cflags               = \
     -Werror -Wall -Iinclude    \
     @COMMON_INCLUDE@           \
     @COMMON_SSH_INCLUDE@       \
-    @LIBGUAC_INCLUDE@
+    @LIBGUAC_INCLUDE@          \
+    @RDP_CFLAGS@
 
 guacsvc_ldflags =                  \
     -module -avoid-version -shared \