diff --git a/HISTORY.md b/HISTORY.md
index 4eefb86..7f546b3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -3,6 +3,10 @@ A Makefile for Arduino Sketches
 
 The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
 
+### 0.11.1 (in development)
+- Fix "generated_assembly" target, which got broken earlier. Fix issue #76 (https://github.com/matthijskooijman)
+- Deprecate "generated_assembly" target in favour of "generate_assembly". Fix issue #79
+
 ### 0.11.0 (2013-06-15)
 - Replace hardcoded executables with variable
 - Fix whitespace issues
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk
index 37598ae..5192464 100644
--- a/arduino-mk/Arduino.mk
+++ b/arduino-mk/Arduino.mk
@@ -990,10 +990,13 @@ endif
 
 verify_size:	$(TARGET_HEX) $(TARGET_HEX).sizeok
 
-generated_assembly: $(OBJDIR)/$(TARGET).s
+generate_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 raw_eeprom error_on_leonardo reset reset_stty ispload clean depends size show_boards monitor disasm symbol_sizes generated_assembly verify_size
+generated_assembly: generate_assembly
+	@$(ECHO) "generated_assembly" target is deprecated. Use "generate_assembly" target instead
+	
+.PHONY:	all upload raw_upload raw_eeprom error_on_leonardo reset reset_stty ispload clean depends size show_boards monitor disasm symbol_sizes generated_assembly generate_assembly verify_size
 
 # added - in the beginning, so that we don't get an error if the file is not present
 -include $(DEPS)