diff --git a/ccs/Makefile b/ccs/Makefile
index cb36c8c71..ec4666541 100644
--- a/ccs/Makefile
+++ b/ccs/Makefile
@@ -1,4 +1,4 @@
 include ../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=libccscompat daemon ccsais ccs_tool man
+SUBDIRS=libccscompat daemon ccsais man
diff --git a/ccs/man/Makefile b/ccs/man/Makefile
index 43133a630..abedd52a0 100644
--- a/ccs/man/Makefile
+++ b/ccs/man/Makefile
@@ -1,12 +1,6 @@
 TARGET= cluster.conf.5 \
 	ccs.7 \
-	ccsd.8 \
-	ccs_tool.8
+	ccsd.8
 
 include ../../make/defines.mk
-
-ifdef legacy_code
-TARGET += ccs_test.8
-endif
-
 include $(OBJDIR)/make/man.mk
diff --git a/config/tools/Makefile b/config/tools/Makefile
index 8b2d2fc5a..04cc74210 100644
--- a/config/tools/Makefile
+++ b/config/tools/Makefile
@@ -1,4 +1,4 @@
 include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=ldap man
+SUBDIRS=ccs_tool ldap man
diff --git a/ccs/ccs_tool/Makefile b/config/tools/ccs_tool/Makefile
similarity index 75%
rename from ccs/ccs_tool/Makefile
rename to config/tools/ccs_tool/Makefile
index ff77b9fef..428b9fa73 100644
--- a/ccs/ccs_tool/Makefile
+++ b/config/tools/ccs_tool/Makefile
@@ -1,56 +1,56 @@
 TARGET1 = ccs_tool
 TARGET2 = ccs_test
 
 SBINDIRT = $(TARGET1)
 SBINSYMT = $(TARGET2)
 
-include ../../make/defines.mk
+include ../../../make/defines.mk
 
 ifdef legacy_code
 all: depends ${TARGET1} ${TARGET2}
 else
 all: ${TARGET1} ${TARGET2}
 endif
 
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
 include $(OBJDIR)/make/uninstall.mk
 
 OBJS =	ccs_tool.o \
 	editconf.o
 
 ifdef legacy_code
 OBJS += update.o
 endif
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 CFLAGS += -I${cmanincdir} `xml2-config --cflags`
-CFLAGS += -I${ccsincdir} -I$(S)/../include
-CFLAGS += -I$(S)/../libccscompat
+CFLAGS += -I${ccsincdir} -I$(SRCDIR)/ccs/include
+CFLAGS += -I$(SRCDIR)/ccs/libccscompat
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${cmanlibdir} -lcman
 ifdef legacy_code
-LDFLAGS += -L../libccscompat -lccscompat
-LDDEPS += ../libccscompat/libccscompat.a
+LDFLAGS += -L$(OBJDIR)/ccs/libccscompat -lccscompat
+LDDEPS += $(OBJDIR)/ccs/libccscompat/libccscompat.a
 else
 LDFLAGS += -L${ccslibdir} -lccs
 endif
 LDFLAGS += `xml2-config --libs`
 LDFLAGS += -L${libdir}
 
 ${TARGET1}: ${OBJS} ${LDDEPS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 ${TARGET2}: ${TARGET1}
 	ln -sf ${TARGET1} ${TARGET2}
 
 ifdef legacy_code
 depends:
-	$(MAKE) -C ../libccscompat all
+	$(MAKE) -C $(OBJDIR)/ccs/libccscompat all
 endif
 
 clean: generalclean
 
 -include $(OBJS:.o=.d)
diff --git a/ccs/ccs_tool/ccs_tool.c b/config/tools/ccs_tool/ccs_tool.c
similarity index 100%
rename from ccs/ccs_tool/ccs_tool.c
rename to config/tools/ccs_tool/ccs_tool.c
diff --git a/ccs/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c
similarity index 100%
rename from ccs/ccs_tool/editconf.c
rename to config/tools/ccs_tool/editconf.c
diff --git a/ccs/ccs_tool/editconf.h b/config/tools/ccs_tool/editconf.h
similarity index 100%
rename from ccs/ccs_tool/editconf.h
rename to config/tools/ccs_tool/editconf.h
diff --git a/ccs/ccs_tool/update.c b/config/tools/ccs_tool/update.c
similarity index 100%
rename from ccs/ccs_tool/update.c
rename to config/tools/ccs_tool/update.c
diff --git a/ccs/ccs_tool/update.h b/config/tools/ccs_tool/update.h
similarity index 100%
rename from ccs/ccs_tool/update.h
rename to config/tools/ccs_tool/update.h
diff --git a/config/tools/man/Makefile b/config/tools/man/Makefile
index ee4d87489..c40d94b76 100644
--- a/config/tools/man/Makefile
+++ b/config/tools/man/Makefile
@@ -1,4 +1,10 @@
-TARGET= confdb2ldif.8
+TARGET= ccs_tool.8 \
+	confdb2ldif.8
 
 include ../../../make/defines.mk
+
+ifdef legacy_code
+TARGET += ccs_test.8
+endif
+
 include $(OBJDIR)/make/man.mk
diff --git a/ccs/man/ccs_test.8 b/config/tools/man/ccs_test.8
similarity index 100%
rename from ccs/man/ccs_test.8
rename to config/tools/man/ccs_test.8
diff --git a/ccs/man/ccs_tool.8 b/config/tools/man/ccs_tool.8
similarity index 100%
rename from ccs/man/ccs_tool.8
rename to config/tools/man/ccs_tool.8