diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb
index 94539ec..da73914 100644
--- a/app/models/enabled_module.rb
+++ b/app/models/enabled_module.rb
@@ -28,6 +28,11 @@ class EnabledModule < ActiveRecord::Base
   # after_create callback used to do things when a module is enabled
   def module_enabled
     case name
+    when 'boards'
+      # Create general discussion board
+      if project && project.boards.blank?
+        Board.create(:project => project, :name => l(:label_general), :description => l(:label_general_discussion))
+      end
     when 'wiki'
       # Create a wiki with a default start page
       if project && project.wiki.nil?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8fa1a36..97ead06 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -819,6 +819,7 @@ de:
     other: "%{count} Projekte"
   label_year: Jahr
   label_yesterday: gestern
+  label_general_discussion: Diskussion über allgemeine Themen
 
   mail_body_account_activation_request: "Ein neuer Benutzer (%{value}) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:"
   mail_body_account_information: Ihre Konto-Informationen
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9b4595..bd59978 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -908,6 +908,7 @@ en:
   label_drop_down_list: drop-down list
   label_checkboxes: checkboxes
   label_link_values_to: Link values to URL
+  label_general_discussion: Discussion about general topics
 
   button_login: Login
   button_submit: Submit