diff --git a/Makefile.include b/Makefile.include
index a30ce2be4f148e590178ab3913e1b473088157a0..f51b8c9cfe1141770ba9da5bc96c0e1e2a905007 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -193,7 +193,7 @@ flash: all
 	$(FLASHER) $(FFLAGS)
 
 term:
-	$(TERMPROG) $(TERMFLAGS) $(PORT)
+	$(TERMPROG) $(TERMFLAGS)
 
 doc:
 	make -BC $(RIOTBASE) doc
diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include
index 32fa833303edf20e46038f3a630bb79fad8cc0db..eb4b782964c1d7a057015994fe81e6e29728f279 100644
--- a/boards/arduino-due/Makefile.include
+++ b/boards/arduino-due/Makefile.include
@@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS += -O binary
 export FFLAGS += -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 68bdb30fe757b256765b35fabaccab17674d7b74..fdfcad9333ca772b1d9bdb0e4e3d9b7bd361439a 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -26,7 +26,7 @@ export DEBUGSERVER = $(FLASHER)
 export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
 export DEBUGGER = $(PREFIX)gdb
 export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
 
diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include
index c7cc56c77f9455eb49eaf232944d57fb1ab09f4b..866478226dcf86162b31ebb598a0f36f92c4c6e1 100644
--- a/boards/msba2-common/Makefile.include
+++ b/boards/msba2-common/Makefile.include
@@ -20,7 +20,7 @@ ifeq ($(strip $(PORT)),)
 	export PORT = /dev/ttyUSB0
 endif
 export FFLAGS = $(PORT) $(HEXFILE)
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 include $(RIOTBOARD)/msba2-common/Makefile.dep
 
 export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
index 6b5a8ccc772186196864ce1051e00eda50ad95c8..fcde57dfad1a75240d391da91aadcfa53a9d370c 100644
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@@ -84,6 +84,10 @@ else
 	export PORT =
 endif
 
+ifeq (,$(filter $(PORT),$(TERMFLAGS)))
+    export TERMFLAGS += $(PORT)
+endif
+
 all: # do not override first target
 
 all-debug: all
diff --git a/boards/pca10000/Makefile.include b/boards/pca10000/Makefile.include
index ee20cc6263da9fba6c23d910e0cfde8f05cae500..ce83d80d1bca763d2931f0e34d05f4fc2793b24e 100644
--- a/boards/pca10000/Makefile.include
+++ b/boards/pca10000/Makefile.include
@@ -39,7 +39,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
 export HEXFILE = $(ELFFILE:.elf=.bin)
-export TERMFLAGS = -p
+export TERMFLAGS += -p "$(PORT)"
 export FFLAGS = $(BINDIR) $(HEXFILE)
 export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)
diff --git a/boards/pca10005/Makefile.include b/boards/pca10005/Makefile.include
index 110707b2762aa1c9ef93711ddce9b0bc66eceeb7..4e79b70a82c7ad34de26253834a08f242a49aa3d 100644
--- a/boards/pca10005/Makefile.include
+++ b/boards/pca10005/Makefile.include
@@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
 # $(LINKERSCRIPT) is specified in cpu/Makefile.include
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
-export TERMFLAGS = -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index 2cedc3c68620a0c2ceffac82903da12ea3ce16f0..0f01f88f5cef0a4558fecd8f283e7079398e1e72 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -26,7 +26,7 @@ ifeq ($(strip $(PORT)),)
 endif
 export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
 export OFLAGS = -O binary --gap-fill=0xff
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/
 export INCLUDES += -I$(RIOTCPU)/$(CPU)/maca/include
diff --git a/boards/stm32f0discovery/Makefile.include b/boards/stm32f0discovery/Makefile.include
index 94058251a99f4d2e0ca624d9044672a9d05bcdf4..0dfddc9a7f6ee69754a83012e185390a70687cbc 100644
--- a/boards/stm32f0discovery/Makefile.include
+++ b/boards/stm32f0discovery/Makefile.include
@@ -39,7 +39,7 @@ export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x08000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf bin/$(BOARD)/$(APPLICATION).elf
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/stm32f3discovery/Makefile.include b/boards/stm32f3discovery/Makefile.include
index 60a9ea884d312e1ea0f34492ef3b8da3de0568ff..744a557b788ad60cf114ee6741bf4ed91694f45e 100644
--- a/boards/stm32f3discovery/Makefile.include
+++ b/boards/stm32f3discovery/Makefile.include
@@ -38,7 +38,7 @@ export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
-export TERMFLAGS = -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use newLib nano-specs if available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/stm32f4discovery/Makefile.include b/boards/stm32f4discovery/Makefile.include
index 6919759a3ac3eac31248a6056d243905145d683d..d0232f0fa4d5d2159f4345f4fecd94d12030fb2e 100644
--- a/boards/stm32f4discovery/Makefile.include
+++ b/boards/stm32f4discovery/Makefile.include
@@ -38,7 +38,7 @@ export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS = -O binary
 export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use newLib nano-specs if available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index af5153818eba6d3ca23120c0a2e7bf02d1f2fbfa..3bc3023a8c6e95d7d59f0ed60f1ed3c1ff9c9169 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -20,7 +20,7 @@ ifeq ($(strip $(PORT)),)
     export PORT = /dev/ttyUSB0
 endif
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 export INCLUDES += -I$(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
 export OFLAGS = -O ihex
diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include
index 8fcc8e1ad78ceecefcfab91458483b7cf819813a..6f539174d052b93ccb564b1bb37a4a767302816d 100644
--- a/boards/udoo/Makefile.include
+++ b/boards/udoo/Makefile.include
@@ -36,7 +36,7 @@ export LINKFLAGS += -g3 -ggdb -std=gnu99 $(CPU_USAGE) $(FPU_USAGE) -mlittle-endi
 export LINKFLAGS += -T$(LINKERSCRIPT)
 export OFLAGS += -O binary
 export FFLAGS += -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include
index f2ed73a4055b0e9eb5888b284e4d6f951c236b5b..f0a4f29ea21f6be8e19e80b25cf3cef57c701c15 100644
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@@ -21,7 +21,7 @@ ifeq ($(strip $(PORT)),)
 endif
 export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
 export OFLAGS = -O ihex
-export TERMFLAGS += -p
+export TERMFLAGS += -p "$(PORT)"
 
 export INCLUDES += -I $(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include