diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 8ca9caabe..c3714b8d8 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -266,11 +266,17 @@ bin_PROGRAMS = lxc-attach \
 	       lxc-top \
 	       lxc-unfreeze \
 	       lxc-unshare \
-	       lxc-usernsexec \
 	       lxc-wait
 endif
 
 if ENABLE_COMMANDS
+
+if ENABLE_TOOLS
+bin_PROGRAMS += lxc-usernsexec
+else
+bin_PROGRAMS = lxc-usernsexec
+endif
+
 sbin_PROGRAMS = init.lxc
 
 pkglibexec_PROGRAMS = lxc-monitord \