diff --git a/lib/ceedling/file_finder.rb b/lib/ceedling/file_finder.rb
index e0a73bf6a..d496d38a0 100644
--- a/lib/ceedling/file_finder.rb
+++ b/lib/ceedling/file_finder.rb
@@ -30,7 +30,7 @@ def find_header_input_for_mock_file(mock_file)
       mock_input = @cacheinator.diff_cached_test_file( @file_path_utils.form_preprocessed_file_filepath( found_path ) )
     end
 
-    return mock_input
+    return mock_input, found_path
   end
 
 
diff --git a/lib/ceedling/generator.rb b/lib/ceedling/generator.rb
index 511aa8c81..3816e70a8 100644
--- a/lib/ceedling/generator.rb
+++ b/lib/ceedling/generator.rb
@@ -45,15 +45,15 @@ def generate_dependencies_file(tool, context, source, object, dependencies)
   end
 
   def generate_mock(context, mock)
-    arg_hash = {:header_file => mock.source, :context => context}
+    arg_hash = {:header_file => mock[0].source, :context => context}
     @plugin_manager.pre_mock_generate( arg_hash )
 
     begin
-      folder = @file_path_utils.form_folder_for_mock(mock.name)
+      folder = @file_path_utils.form_folder_for_mock(mock[0].name)
       if folder == ''
         folder = nil
       end
-      @cmock_builder.cmock.setup_mocks( arg_hash[:header_file], folder )
+      @cmock_builder.cmock.setup_mocks( arg_hash[:header_file], mock[0].sources[1], folder )
     rescue
       raise
     ensure
diff --git a/lib/ceedling/rules_cmock.rake b/lib/ceedling/rules_cmock.rake
index c4ff81aa8..76b65d8db 100644
--- a/lib/ceedling/rules_cmock.rake
+++ b/lib/ceedling/rules_cmock.rake
@@ -4,7 +4,7 @@ rule(/#{CMOCK_MOCK_PREFIX}[^\/\\]+#{'\\'+EXTENSION_SOURCE}$/ => [
     proc do |task_name|
       @ceedling[:file_finder].find_header_input_for_mock_file(task_name)
     end  
-  ]) do |mock|
+  ]) do |mock,orig|
 
-  @ceedling[:generator].generate_mock(TEST_SYM, mock)
+  @ceedling[:generator].generate_mock(TEST_SYM, [mock,orig])
 end
diff --git a/vendor/cmock b/vendor/cmock
index 379a9a8d5..6e58316fd 160000
--- a/vendor/cmock
+++ b/vendor/cmock
@@ -1 +1 @@
-Subproject commit 379a9a8d5dd5cdff8fd345710dd70ae26f966c71
+Subproject commit 6e58316fd02420b1cc0bfbaa38d240cc0f201992