diff --git a/README.md b/README.md
index f014149..3a0f280 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,19 @@ The following are the list of changes that I have made or merged in this fork. H
 ###   0.10 17.ix.12   M J Oldfield
 - Merged all changes from Upstream
 
+###  0.10.1 15.xii.2012 Sudar
+- Merged all changes from Upstream and the following changes from https://github.com/rpavlik
+- Allow passing extra flags
+- Make listing files more useful
+- Add knowledge of device-specific assembler
+- Use variables instead of hardcoded commands
+- Make disasm more helpful
+- Change .sym output
+- Provide symbol_sizes and generated_assembly targets.
+- Be able to silence configuration output
+- Make everybody depend on the makefile, in case cflags are changed, etc.
+- Make the makefile error if the arduino port is not present.
+
 ## Know Issues
 - Because of the way the makefile is structured, the configuration parameters gets printed twice. 
 - Doesn't work with Leonardo yet.
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 96c6083..478ef07 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -128,6 +128,19 @@
 #            - Added support for USB_PID/VID used by the Leonardo (ex Dan
 #              Villiom Podlaski Christiansen and Marc Plano-Lesay).
 #                      
+#   	0.10.1 15.xii.2012 Sudar
+#   		- Merged all changes from Upstream and from https://github.com/rpavlik
+#   		- Allow passing extra flags (https://github.com/rpavlik)
+#   		- Make listing files more useful (https://github.com/rpavlik)
+#   		- Add knowledge of device-specific assembler (https://github.com/rpavlik)
+#   		- Use variables instead of hardcoded commands (https://github.com/rpavlik)
+#   		- Make disasm more helpful (https://github.com/rpavlik)
+#   		- Change .sym output (https://github.com/rpavlik)
+#   		- Provide symbol_sizes and generated_assembly targets. (https://github.com/rpavlik)
+#   		- Be able to silence configuration output (https://github.com/rpavlik)
+#   		- Make everybody depend on the makefile, in case cflags are changed, etc. (https://github.com/rpavlik)
+#   		- Make the makefile error if the arduino port is not present. (https://github.com/rpavlik)
+#
 ########################################################################
 #
 # PATHS YOU NEED TO SET UP
@@ -174,6 +187,8 @@
 # instead copy them to e.g. /home/mjo/arduino.mk/bin then set
 #   ARDML_DIR = /home/mjo/arduino.mk
 #
+# If you'd rather not see the configuration output, define ARDUINO_QUIET.
+#
 ########################################################################
 #
 # DEPENDENCIES
@@ -305,19 +320,25 @@ dir_if_exists = $(if $(wildcard $(1)$(2)),$(1))
 # the number of bytes indicated by the second argument.
 space_pad_to = $(shell echo $(1) "                                                      " | head -c$(2))
 
+ifndef ARDUINO_QUIET
+    arduino_output = $(info $(1))
+else
+    arduino_output =
+endif
+
 # Call with some text, and a prefix tag if desired (like [AUTODETECTED]),
-show_config_info = $(info - $(call space_pad_to,$(2),20) $(1))
+show_config_info = $(call arduino_output,- $(call space_pad_to,$(2),20) $(1))
 
 # Call with the name of the variable, a prefix tag if desired (like [AUTODETECTED]),
 # and an explanation if desired (like (found in $$PATH)
 show_config_variable = $(call show_config_info,$(1) = $($(1)) $(3),$(2))
 
 # Just a nice simple visual separator
-show_separator = $(info -------------------------)
+show_separator = $(call arduino_output,-------------------------)
 
 
 $(call show_separator)
-$(info Arduino.mk Configuration:)
+$(call arduino_output,Arduino.mk Configuration:)
 
 ifndef ARDUINO_DIR
     AUTO_ARDUINO_DIR := $(firstword \
@@ -636,6 +657,7 @@ DEP_FILE   = $(OBJDIR)/depends.mk
 # Names of executables
 CC      = $(AVR_TOOLS_PATH)/avr-gcc
 CXX     = $(AVR_TOOLS_PATH)/avr-g++
+AS      = $(AVR_TOOLS_PATH)/avr-as
 OBJCOPY = $(AVR_TOOLS_PATH)/avr-objcopy
 OBJDUMP = $(AVR_TOOLS_PATH)/avr-objdump
 AR      = $(AVR_TOOLS_PATH)/avr-ar
@@ -679,14 +701,14 @@ CPPFLAGS      += -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERSION) \
 			$(SYS_INCLUDES) $(USER_INCLUDES) -g -Os -w -Wall \
 			-DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) \
 			-ffunction-sections -fdata-sections
-CFLAGS        += -std=gnu99
-CXXFLAGS      += -fno-exceptions
+CFLAGS        += -std=gnu99 $(EXTRA_FLAGS) $(EXTRA_CFLAGS)
+CXXFLAGS      += -fno-exceptions $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
 ASFLAGS       += -mmcu=$(MCU) -I. -x assembler-with-cpp
-LDFLAGS       += -mmcu=$(MCU) -Wl,--gc-sections -Os
+LDFLAGS       += -mmcu=$(MCU) -Wl,--gc-sections -Os $(EXTRA_FLAGS) $(EXTRA_CXXFLAGS)
 SIZEFLAGS     ?= --mcu=$(MCU) -C
 
-# Expand and pick the first port
-ARD_PORT      = $(firstword $(wildcard $(ARDUINO_PORT)))
+# Returns the Arduino port (first wildcard expansion) if it exists, otherwise it errors.
+get_arduino_port = $(if $(wildcard $(ARDUINO_PORT)),$(firstword $(wildcard $(ARDUINO_PORT))),$(error Arduino port $(ARDUINO_PORT) not found!))
 
 # Command for avr_size: do $(call avr_size,elffile,hexfile)
 ifneq (,$(findstring AVR,$(shell $(SIZE) --help)))
@@ -703,7 +725,7 @@ endif
 
 
 ifneq (,$(strip $(ARDUINO_LIBS)))
-    $(info -)
+    $(call arduino_output,-)
     $(call show_config_info,ARDUINO_LIBS =)
 endif
 ifneq (,$(strip $(USER_LIB_NAMES)))
@@ -746,77 +768,85 @@ $(OBJDIR)/libs/%.o: $(USER_LIB_PATH)/%.c
 # normal local sources
 # .o rules are for objects, .d for dependency tracking
 # there seems to be an awful lot of duplication here!!!
-$(OBJDIR)/%.o: %.c
+COMMON_DEPS := Makefile
+$(OBJDIR)/%.o: %.c $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.cc
+$(OBJDIR)/%.o: %.cc $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.cpp
+$(OBJDIR)/%.o: %.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.S
+$(OBJDIR)/%.o: %.S $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: %.s
+$(OBJDIR)/%.o: %.s $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(ASFLAGS) $< -o $@
 
-$(OBJDIR)/%.d: %.c
+$(OBJDIR)/%.d: %.c $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(CFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.cc
+$(OBJDIR)/%.d: %.cc $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.cpp
+$(OBJDIR)/%.d: %.cpp $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.S
+$(OBJDIR)/%.d: %.S $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
-$(OBJDIR)/%.d: %.s
+$(OBJDIR)/%.d: %.s $(COMMON_DEPS)
 	$(CC) -MM $(CPPFLAGS) $(ASFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
 #backward compatibility for .pde files
 # We should check for Arduino version, if the file is .pde because a .pde file might be used in Arduino 1.0
 # the pde -> cpp -> o file
-$(OBJDIR)/%.cpp: %.pde
+$(OBJDIR)/%.cpp: %.pde $(COMMON_DEPS)
 	$(ECHO) '#if ARDUINO >= 100\n    #include "Arduino.h"\n#else\n    #include "WProgram.h"\n#endif' > $@
 	$(CAT)  $< >> $@
 
 # the ino -> cpp -> o file
-$(OBJDIR)/%.cpp: %.ino
+$(OBJDIR)/%.cpp: %.ino $(COMMON_DEPS)
 	$(ECHO) '#include <Arduino.h>' > $@
 	$(CAT)  $< >> $@
 
-$(OBJDIR)/%.o: $(OBJDIR)/%.cpp
+$(OBJDIR)/%.o: $(OBJDIR)/%.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
-$(OBJDIR)/%.d: $(OBJDIR)/%.cpp
+$(OBJDIR)/%.d: $(OBJDIR)/%.cpp $(COMMON_DEPS)
 	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $< -MF $@ -MT $(@:.d=.o)
 
+# generated assembly
+$(OBJDIR)/%.s: $(OBJDIR)/%.cpp $(COMMON_DEPS)
+	$(CXX) -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+
+#$(OBJDIR)/%.lst: $(OBJDIR)/%.s
+#	$(AS) -mmcu=$(MCU) -alhnd $< > $@
+
 # core files
-$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c
+$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
 
-$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp
+$(OBJDIR)/%.o: $(ARDUINO_CORE_PATH)/%.cpp $(COMMON_DEPS)
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
 
 # various object conversions
-$(OBJDIR)/%.hex: $(OBJDIR)/%.elf
+$(OBJDIR)/%.hex: $(OBJDIR)/%.elf $(COMMON_DEPS)
 	$(OBJCOPY) -O ihex -R .eeprom $< $@
-	@echo
-	@echo
+	@$(ECHO)
+	@$(ECHO)
 	$(call avr_size,$<,$@)
 
-$(OBJDIR)/%.eep: $(OBJDIR)/%.elf
+$(OBJDIR)/%.eep: $(OBJDIR)/%.elf $(COMMON_DEPS)
 	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
 		--change-section-lma .eeprom=0 -O ihex $< $@
 
-$(OBJDIR)/%.lss: $(OBJDIR)/%.elf
-	$(OBJDUMP) -h -S $< > $@
+$(OBJDIR)/%.lss: $(OBJDIR)/%.elf $(COMMON_DEPS)
+	$(OBJDUMP) -h --source --demangle --wide $< > $@
 
-$(OBJDIR)/%.sym: $(OBJDIR)/%.elf
-	$(NM) -n $< > $@
+$(OBJDIR)/%.sym: $(OBJDIR)/%.elf $(COMMON_DEPS)
+	$(NM) --size-sort --demangle --reverse-sort --line-numbers $< > $@
 
 ########################################################################
 #
@@ -839,7 +869,7 @@ ifdef AVRDUDE_CONF
     AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
 endif
 
-AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(ARD_PORT)
+AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P $(call get_arduino_port)
 
 ifndef ISP_PROG
     ISP_PROG	   = -c stk500v2
@@ -874,7 +904,7 @@ raw_upload:	reset $(TARGET_HEX)
 			-U flash:w:$(TARGET_HEX):i
 
 reset:
-		$(RESET_CMD) $(ARD_PORT)
+		$(RESET_CMD) $(call get_arduino_port)
 
 # stty on MacOS likes -F, but on Debian it likes -f redirecting
 # stdin/out appears to work but generates a spurious error on MacOS at
@@ -883,9 +913,9 @@ reset_stty:
 		for STTYF in 'stty -F' 'stty --file' 'stty -f' 'stty <' ; \
 		  do $$STTYF /dev/tty >/dev/null 2>/dev/null && break ; \
 		done ;\
-		$$STTYF $(ARD_PORT)  hupcl ;\
+		$$STTYF $(call get_arduino_port)  hupcl ;\
 		(sleep 0.1 || sleep 1)     ;\
-		$$STTYF $(ARD_PORT) -hupcl
+		$$STTYF $(call get_arduino_port) -hupcl
 
 ispload:	$(TARGET_HEX)
 		$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ISP_OPTS) -e \
@@ -902,7 +932,7 @@ clean:
 		$(REMOVE) $(LOCAL_OBJS) $(CORE_OBJS) $(LIB_OBJS) $(CORE_LIB) $(TARGETS) $(DEP_FILE) $(DEPS) $(USER_LIB_OBJS) ${OBJDIR}
 
 depends:	$(DEPS)
-		cat $(DEPS) > $(DEP_FILE)
+		$(CAT) $(DEPS) > $(DEP_FILE)
 
 size:		$(OBJDIR) $(TARGET_HEX)
 		$(call avr_size,$(TARGET_ELF),$(TARGET_HEX))
@@ -911,11 +941,18 @@ show_boards:
 		$(PARSE_BOARD_CMD) --boards
 
 monitor:
-		$(MONITOR_CMD) $(ARD_PORT) $(MONITOR_BAUDRATE)
+		$(MONITOR_CMD) $(call get_arduino_port) $(MONITOR_BAUDRATE)
 
-disasm: all $(OBJDIR)/$(TARGET).lss
+disasm: $(OBJDIR)/$(TARGET).lss
+	@$(ECHO) The compiled ELF file has been disassembled to $(OBJDIR)/$(TARGET).lss
 
-.PHONY:	all clean depends upload raw_upload reset reset_stty size show_boards monitor
+symbol_sizes: $(OBJDIR)/$(TARGET).sym
+	@$(ECHO) A symbol listing sorted by their size have been dumped to $(OBJDIR)/$(TARGET).sym
+
+generated_assembly: $(OBJDIR)/$(TARGET).s
+	@$(ECHO) Compiler-generated assembly for the main input source has been dumped to $(OBJDIR)/$(TARGET).s
+
+.PHONY:	all upload raw_upload reset reset_stty ispload clean depends size show_boards monitor disasm symbol_sizes generated_assembly
 
 # added - in the beginning, so that we don't get an error if the file is not present
 ifneq ($(MAKECMDGOALS),clean)