diff --git a/app/models/project.rb b/app/models/project.rb
index 7b908083..00aa5df6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -408,7 +408,7 @@ class Project < ActiveRecord::Base
   def copy(project, options={})
     project = project.is_a?(Project) ? project : Project.find(project)
     
-    to_be_copied = %w(wiki versions issue_categories issues members queries)
+    to_be_copied = %w(wiki versions issue_categories issues members queries boards)
     to_be_copied = to_be_copied & options[:only].to_a unless options[:only].nil?
     
     Project.transaction do
@@ -521,6 +521,16 @@ class Project < ActiveRecord::Base
       self.queries << new_query
     end
   end
+
+  # Copies boards from +project+
+  def copy_boards(project)
+    project.boards.each do |board|
+      new_board = Board.new
+      new_board.attributes = board.attributes.dup.except("id", "project_id", "topics_count", "messages_count", "last_message_id")
+      new_board.project = self
+      self.boards << new_board
+    end
+  end
   
   def allowed_permissions
     @allowed_permissions ||= begin
diff --git a/app/views/projects/copy.rhtml b/app/views/projects/copy.rhtml
index f88817c1..49e26278 100644
--- a/app/views/projects/copy.rhtml
+++ b/app/views/projects/copy.rhtml
@@ -18,6 +18,7 @@
   <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
   <label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
   <label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
   <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
   <%= hidden_field_tag 'only[]', '' %>
 </fieldset>
diff --git a/test/fixtures/boards.yml b/test/fixtures/boards.yml
index 0d613587..cce3fdcc 100644
--- a/test/fixtures/boards.yml
+++ b/test/fixtures/boards.yml
@@ -17,3 +17,12 @@ boards_002:
   position: 2
   last_message_id: 
   messages_count: 0
+boards_003: 
+  name: Discussion
+  project_id: 2
+  topics_count: 0
+  id: 3
+  description: Discussion board
+  position: 1
+  last_message_id: 
+  messages_count: 0
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index a08b5f85..082a850b 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -488,6 +488,15 @@ class ProjectTest < ActiveSupport::TestCase
       end
     end
 
+    should "copy boards" do
+      assert @project.copy(@source_project)
+
+      assert_equal 1, @project.boards.size
+      @project.boards.each do |board|
+        assert !@source_project.boards.include?(board)
+      end
+    end
+
     should "change the new issues to use the copied issue categories" do
       issue = Issue.find(4)
       issue.update_attribute(:category_id, 3)