diff --git a/configure.in b/configure.in
index 885d4bda16..f04228dee4 100644
--- a/configure.in
+++ b/configure.in
@@ -221,11 +221,7 @@ AC_SUBST(LIBNL_LIBS)
 
 PKG_CHECK_MODULES(POLKIT, polkit-dbus)
 
-AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
-    [polkit-policy-file-validate], [polkit-policy-file-validate])
-if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
-    AC_MSG_ERROR([polkit-policy-file-validate not found])
-fi
+AC_PATH_PROG([POLKIT_POLICY_FILE_VALIDATE], [polkit-policy-file-validate], [false])
 
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
diff --git a/policy/Makefile.am b/policy/Makefile.am
index 243f3b743f..69f5d2e9b1 100644
--- a/policy/Makefile.am
+++ b/policy/Makefile.am
@@ -4,11 +4,11 @@ dist_polkit_policy_DATA =    				\
 	org.freedesktop.network-manager-settings.system.policy
 
 check:
-	for f in $(dist_polkit_policy_DATA); do \
+	@for f in $(dist_polkit_policy_DATA); do \
             echo -n "Validate PolicyKit policy in $$f : "; \
             $(POLKIT_POLICY_FILE_VALIDATE) $(srcdir)/$$f ; \
 	    ret=$$?; \
-            if  [ "$$ret" == "0" ]; \
+            if  [ "$$ret" = "0" ]; \
 	      then \
                 echo ok; \
             else \