diff --git a/Makefile.buildtests b/Makefile.buildtests
index 1ca6e4188b20f6d69446aa77cc1ba85785903e6e..16a1ee969b288910b3666f276d3dfd014134330a 100644
--- a/Makefile.buildtests
+++ b/Makefile.buildtests
@@ -193,4 +193,11 @@ buildinfo:
 	@echo 'DEBUGGER:       $(DEBUGGER)'
 	@echo 'DEBUGGER_FLAGS: $(DEBUGGER_FLAGS)'
 	@echo ''
+	@echo 'DEBUGSERVER:       $(DEBUGSERVER)'
+	@echo 'DEBUGSERVER_FLAGS: $(DEBUGSERVER_FLAGS)'
+	@echo ''
+	@echo 'RESET:       $(RESET)'
+	@echo 'RESET_FLAGS: $(RESET_FLAGS)'
+	@echo ''
 	@echo -e 'MAKEFILE_LIST:$(patsubst %, \n\t%, $(abspath $(MAKEFILE_LIST)))'
+
diff --git a/Makefile.include b/Makefile.include
index c2867acfe515eac4705167d22450cd57bbbc6c63..1ac1b589b2226463eaba45f9cb5f1aa6ef42fed8 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -157,6 +157,12 @@ doc:
 debug:
 	$(DEBUGGER) $(DEBUGGER_FLAGS)
 
+debug-server:
+	$(DEBUGSERVER) $(DEBUGSERVER_FLAGS)
+
+reset:
+	$(RESET) $(RESET_FLAGS)
+
 # Extra make goals for testing and comparing changes.
 include $(RIOTBASE)/Makefile.buildtests
 
diff --git a/Makefile.vars b/Makefile.vars
index 2f895fdede14a8bd545ec1ee0499c95045a7dcdb..c91f33b7c129301eb2e47abc971d4d51662033c8 100644
--- a/Makefile.vars
+++ b/Makefile.vars
@@ -40,3 +40,9 @@ export TERMPROG              # The command to call on "make term".
 export PORT                  # The parameters to supply to TERMPROG.
 export ELFFILE               # The unstripped result of the compilation.
 export HEXFILE               # The stripped result of the compilation.
+export DEBUGGER              # The command to call on "make debug", usually a script starting the GDB front-end
+export DEBUGGER_FLAGS        # The parameters to supply to DEBUGGER
+export DEBUGSERVER           # The command to call on "make debug-server", usually a script starting the GDB server
+export DEBUGSERVER_FLAGS     # The parameters to supply to DEBUGSERVER
+export RESET                 # The command to call on "make reset", this command resets/reboots the target
+export RESET_FLAGS           # The parameters to supply to RESET