diff --git a/ChangeLog b/ChangeLog
index 5ca279ddc495ecfb146cc6dd601b883bad7d66ba..65b9cc53f1c583e4ab8a070297952f5ac5bd5c49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@ version 1.0 -- UNRELEASED
 	   Thanks to Yuval Kogman <nothingmuch@woobling.org> for the patch.
 	mysql:
 	 . Don't attempt to dump performance_schema database (Redmine#3741).
+    build system changes
+	 . Workaround automake sanity check that would prevent us from
+	   installing lib/* into lib/backupninja/. Where else are be supposed
+	   to install such files anyway?
 
 version 0.9.10 -- September 23, 2011
     backupninja changes
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 11eba375d9a5868bd18f409fbcffb56e9247eddc..9a54736a2353906a139c38141a8c59fad313e42e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,7 @@
-pkglib_SCRIPTS = easydialog parseini tools vserver
+my_execbindir = $(pkglibdir)
+my_execbin_SCRIPTS = easydialog parseini tools vserver
 
-CLEANFILES = $(pkglib_SCRIPTS)
+CLEANFILES = $(my_execbin_SCRIPTS)
 
 EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in