diff --git a/configure.ac b/configure.ac
index 6713539b43..64f7e60bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -934,7 +934,7 @@ AC_CONFIG_FILES([
 	src/Makefile
 	src/lxc/Makefile
 	src/lxc/lxc.functions
-	src/lxc/tools/lxc-checkconfig
+	src/lxc/cmd/lxc-checkconfig
 	src/lxc/tools/lxc-start-ephemeral
 	src/lxc/tools/lxc-update-config
 	src/lxc/version.h
diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index fe656c6cd2..92b50f85ff 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -216,7 +216,7 @@ liblxc_la_LIBADD += $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS)
 liblxc_la_CFLAGS += $(CGMANAGER_CFLAGS) $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
 endif
 
-bin_SCRIPTS = tools/lxc-checkconfig \
+bin_SCRIPTS = cmd/lxc-checkconfig \
 	      tools/lxc-update-config
 
 EXTRA_DIST = \
diff --git a/src/lxc/tools/lxc-checkconfig.in b/src/lxc/cmd/lxc-checkconfig.in
similarity index 100%
rename from src/lxc/tools/lxc-checkconfig.in
rename to src/lxc/cmd/lxc-checkconfig.in