diff --git a/app/models/project.rb b/app/models/project.rb
index dc1709d84..81868bc96 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -930,6 +930,7 @@ class Project < ActiveRecord::Base
         new_wiki_page = WikiPage.new(page.attributes.dup.except("id", "wiki_id", "created_on", "parent_id"))
         new_wiki_page.content = new_wiki_content
         wiki.pages << new_wiki_page
+        new_wiki_page.attachments = page.attachments.map{|attachement| attachement.copy(:container => new_wiki_page)}
         wiki_pages_map[page.id] = new_wiki_page
       end
 
diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb
index 0a819b78c..3b06de388 100644
--- a/test/unit/project_copy_test.rb
+++ b/test/unit/project_copy_test.rb
@@ -303,7 +303,8 @@ class ProjectCopyTest < ActiveSupport::TestCase
     assert project.wiki
   end
 
-  test "#copy should copy wiki pages and content with hierarchy" do
+  test "#copy should copy wiki pages, attachment and content with hierarchy" do
+    @source_project.wiki.pages.first.attachments << Attachment.first.copy
     assert_difference 'WikiPage.count', @source_project.wiki.pages.size do
       assert @project.copy(@source_project)
     end
@@ -311,6 +312,8 @@ class ProjectCopyTest < ActiveSupport::TestCase
     assert @project.wiki
     assert_equal @source_project.wiki.pages.size, @project.wiki.pages.size
 
+    assert_equal @source_project.wiki.pages.first.attachments.first.filename, @project.wiki.pages.first.attachments.first.filename
+
     @project.wiki.pages.each do |wiki_page|
       assert wiki_page.content
       assert !@source_project.wiki.pages.include?(wiki_page)