diff --git a/Makefile b/Makefile
index 4db57e7337d..4e7e55aa33b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,28 @@
 CC=avr-gcc
 CXX=avr-g++
-#MCU=-mmcu=atmega328p
-#CPU_SPEED=-DF_CPU=16000000UL
-#VARIANTS=standard
+MCU=-mmcu=atmega328p
+CPU_SPEED=-DF_CPU=16000000UL
+VARIANTS=standard
 
 SPI_PATH=libraries/SPI
 SD_PATH=libraries/SD
 PINS_PATH=hardware/arduino/variants/$(VARIANTS)
 WIRING_PATH=hardware/arduino/cores/arduino
 ETHERNET_PATH=libraries/Ethernet
+SOFTWARE_SERIAL_PATH=libraries/SoftwareSerial
 
-STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsd.a librawsd.a
+STATIC_LIBRARIES=libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a
 
 HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \
-	-I$(ETHERNET_PATH)/utility -I$(SD_PATH) -I$(SD_PATH)/utility
+	-I$(ETHERNET_PATH)/utility -I$(SD_PATH) -I$(SD_PATH)/utility -I$(SOFTWARE_SERIAL_PATH)
 ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE
 
-CFLAGS=-mmcu=$(MCU) -DF_CPU=$(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
+CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
 	-funsigned-bitfields -fpack-struct -fshort-enums -fno-exceptions
 
+STRING_CFLAGS=$(MCU) $(CPU_SPEED) -DARDUINO_WIRING_DIGITAL -DARDUINO_STRING -Os -w -funsigned-char \
+	-funsigned-bitfields -fpack-struct -fshort-enums
+
 ARDUINO_FILES=wiring.c wiring_digital.c HardwareSerial.cpp \
 	WInterrupts.c Print.cpp IPAddress.cpp new.cpp
 
@@ -27,6 +31,10 @@ ETHERNET_FILES=Ethernet.cpp EthernetUdp.cpp utility/socket.cpp \
 ETHERNET_SOURCES=$(addprefix $(ETHERNET_PATH)/, $(ETHERNET_FILES))
 ETHERNET_OBJECTS=$(ETHERNET_SOURCES:.cpp=.o)
 
+SOFTWARE_SERIAL_FILES=SoftwareSerial.cpp
+SOFTWARE_SERIAL_SOURCES=$(addprefix $(SOFTWARE_SERIAL_PATH)/,$(SOFTWARE_SERIAL_FILES))
+SOFTWARE_SERIAL_OBJECTS=$(SOFTWARE_SERIAL_SOURCES;.cpp=.o)
+
 ARDUINO_SOURCES=$(addprefix $(WIRING_PATH)/, $(ARDUINO_FILES))
 ARDUINO_OBJECTS1=$(filter %.cpp, $(ARDUINO_SOURCES))
 ARDUINO_OBJECTS2=$(filter %.c, $(ARDUINO_SOURCES))
@@ -35,12 +43,12 @@ ARDUINO_OBJECTS=$(ARDUINO_OBJECTS1:.cpp=.o) $(ARDUINO_OBJECTS2:.c=.o)
 .phony: clean default
 
 default: $(STATIC_LIBRARIES)
-	
+
 clean:
 	echo ------------- CLEAN
-	rm -f libarduino.a libspi.a libethernet.a libsd.a librawsd.a
+	rm -f libarduino.a libspi.a libethernet.a libsd.a librawsd.a libsoftwareserial.a libstring.a
 
-libarduino.a: $(ARDUINO_OBJECTS)
+libarduino.a: $(ARDUINO_OBJECTS)	
 	echo ------------- LIBARDUINO
 	avr-ar rcs $@ $^
 	rm $(ARDUINO_OBJECTS)
@@ -48,23 +56,32 @@ libarduino.a: $(ARDUINO_OBJECTS)
 libspi.a: $(SPI_PATH)/SPI.cpp
 	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SPI_PATH)/SPI.o
 	avr-ar rcs $@ $(SPI_PATH)/SPI.o
-	rm $(SPI_PATH)/SPI.o
+	rm $(SPI_PATH)/SPI.o	
 	
 libsd.a: $(SD_PATH)/SD.cpp librawsd.a
 	@echo --------------------- LIB SD
 	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/SD.o
 	avr-ar rcs $@ $(SD_PATH)/SD.o
 	rm $(SD_PATH)/SD.o
-	
+
 librawsd.a: $(SD_PATH)/utility/Sd2Card.cpp
 	@echo --------------------- LIBRAWSD
 	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SD_PATH)/utility/SD2Card.o
 	avr-ar rcs $@ $(SD_PATH)/utility/SD2Card.o
 	rm $(SD_PATH)/utility/SD2Card.o
 
+libstring.a: $(WIRING_PATH)/WString.cpp 
+	$(CXX) $(HEADER_PATHS) $< $(STRING_CFLAGS) -c -o $(WIRING_PATH)/WString.o
+	avr-ar rcs $@ $(WIRING_PATH)/WString.o 
+	rm $(WIRING_PATH)/WString.o
+	
 libethernet.a: $(ETHERNET_OBJECTS)
 	avr-ar rcs $@ $^
-	rm $(ETHERNET_OBJECTS)
+	rm $(ETHERNET_OBJECTS)	
+
+libsoftwareserial.a: $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.cpp
+	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.o
+	avr-ar rcs $@ $(SOFTWARE_SERIAL_PATH)/SoftwareSerial.o
 
 $(ETHERNET_PATH)/%.o : $(ETHERNET_PATH)/%.cpp
 	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $@	
@@ -74,3 +91,4 @@ $(WIRING_PATH)/%.o : $(WIRING_PATH)/%.c
 
 $(WIRING_PATH)/%.o : $(WIRING_PATH)/%.cpp
 	$(CXX) $(HEADER_PATHS) $< $(CFLAGS) -c -o $@
+