diff --git a/reactos/tools/rsym.c b/reactos/tools/rsym/rsym.c
similarity index 100%
rename from reactos/tools/rsym.c
rename to reactos/tools/rsym/rsym.c
diff --git a/reactos/tools/rsym.h b/reactos/tools/rsym/rsym.h
similarity index 100%
rename from reactos/tools/rsym.h
rename to reactos/tools/rsym/rsym.h
diff --git a/reactos/tools/rsym.mak b/reactos/tools/rsym/rsym.mak
similarity index 84%
rename from reactos/tools/rsym.mak
rename to reactos/tools/rsym/rsym.mak
index 527e548f275..5cd46b93e0b 100644
--- a/reactos/tools/rsym.mak
+++ b/reactos/tools/rsym/rsym.mak
@@ -1,11 +1,20 @@
-RSYM_BASE = $(TOOLS_BASE)
+RSYM_BASE = $(TOOLS_BASE)$(SEP)rsym
 RSYM_BASE_ = $(RSYM_BASE)$(SEP)
-
 RSYM_INT = $(INTERMEDIATE_)$(RSYM_BASE)
 RSYM_INT_ = $(RSYM_INT)$(SEP)
 RSYM_OUT = $(OUTPUT_)$(RSYM_BASE)
 RSYM_OUT_ = $(RSYM_OUT)$(SEP)
 
+$(RSYM_INT): | $(TOOLS_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RSYM_OUT): | $(TOOLS_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
 RSYM_TARGET = \
 	$(RSYM_OUT_)rsym$(EXEPOSTFIX)
 
diff --git a/reactos/tools/rsym_common.c b/reactos/tools/rsym/rsym_common.c
similarity index 100%
rename from reactos/tools/rsym_common.c
rename to reactos/tools/rsym/rsym_common.c
diff --git a/reactos/tools/tools.mak b/reactos/tools/tools.mak
index 256ce7a09e8..88929374c44 100644
--- a/reactos/tools/tools.mak
+++ b/reactos/tools/tools.mak
@@ -50,4 +50,4 @@ include tools/nci/nci.mak
 include tools/pefixup.mak
 include tools/raddr2line.mak
 include tools/rbuild/rbuild.mak
-include tools/rsym.mak
+include tools/rsym/rsym.mak