diff --git a/Makefile.am b/Makefile.am
index 6e1586c..e14374d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,11 +20,6 @@ rpm: $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE).spec
 	rpmbuild -ba $(PACKAGE).spec
 endif
 
-all: make_config_executable
-
-make_config_executable:
-	chmod a+x libvncserver-config
-
 t:
 	$(MAKE) -C test test
 
diff --git a/configure.ac b/configure.ac
index e89bebd..5f7a1b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,6 +348,7 @@ AC_CONFIG_FILES([Makefile
 		 test/Makefile
 		 LibVNCServer.spec
 		 libvncserver-config])
+AC_CONFIG_COMMANDS([chmod-libvncserver-config],[chmod a+x libvncserver-config])
 AC_OUTPUT
 chmod a+x ./libvncserver-config