diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 92b50f85f..6beb197cf 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -290,11 +290,11 @@ lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c
 lxc_create_SOURCES = tools/lxc_create.c tools/arguments.c
 lxc_snapshot_SOURCES = tools/lxc_snapshot.c tools/arguments.c
 lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c tools/arguments.c
-lxc_user_nic_SOURCES = lxc_user_nic.c namespace.c network.c tools/arguments.c
 lxc_monitord_SOURCES = lxc_monitord.c tools/arguments.c
 
 # Binaries shipping with liblxc
 init_lxc_SOURCES = cmd/lxc_init.c
+lxc_user_nic_SOURCES = cmd/lxc_user_nic.c namespace.c network.c
 lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c
 
 if ENABLE_DEPRECATED
diff --git a/src/lxc/lxc_user_nic.c b/src/lxc/cmd/lxc_user_nic.c
similarity index 100%
rename from src/lxc/lxc_user_nic.c
rename to src/lxc/cmd/lxc_user_nic.c