diff --git a/m4/quota.m4 b/m4/quota.m4
index 0695b1e021..d75af447e1 100644
--- a/m4/quota.m4
+++ b/m4/quota.m4
@@ -7,18 +7,25 @@ AC_DEFUN([DOVECOT_RPCGEN], [
   
   have_rquota=no
   if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
-    AC_CHECK_HEADER([rpc/rpc.h], [
-      AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
+    PKG_CHECK_MODULES(LIBTIRPC, libtirpc, [
       have_rquota=yes
+      QUOTA_LIBS="$QUOTA_LIBS \$(LIBTIRPC_LIBS)"
+    ], [
+      AC_CHECK_HEADER([rpc/rpc.h], [
+	have_rquota=yes
+      ])
     ])
   fi
+  if test "$have_rquota" = yes; then
+    AC_DEFINE(HAVE_RQUOTA,, [Define if you wish to retrieve quota of NFS mounted mailboxes])
+  fi
   AM_CONDITIONAL(HAVE_RQUOTA, test "$have_rquota" = "yes")
 ])
 
 AC_DEFUN([DOVECOT_QUOTA], [
   AC_SEARCH_LIBS(quota_open, quota, [
     AC_DEFINE(HAVE_QUOTA_OPEN,, [Define if you have quota_open()])
-    QUOTA_LIBS="-lquota"
+    QUOTA_LIBS="$QUOTA_LIBS -lquota"
   ])
   AC_SUBST(QUOTA_LIBS)
 ])
diff --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am
index f220d4f075..ffebc67404 100644
--- a/src/plugins/quota/Makefile.am
+++ b/src/plugins/quota/Makefile.am
@@ -19,7 +19,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib-storage/index/imapc \
 	-I$(top_srcdir)/src/lib-storage/index/maildir \
 	-I$(top_srcdir)/src/lib-program-client \
-	-I$(top_srcdir)/src/doveadm
+	-I$(top_srcdir)/src/doveadm \
+	$(LIBTIRPC_CFLAGS)
 
 NOPLUGIN_LDFLAGS =
 lib10_doveadm_quota_plugin_la_LDFLAGS = -module -avoid-version