diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index d8d35ba3..a14122c6 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -6,6 +6,20 @@
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.check_box :is_in_chlog %></p>
 <p><%= f.check_box :is_in_roadmap %></p>
+
+<% if IssueCustomField.all.any? %>
+<p>
+	<label><%= l(:label_custom_field_plural) %></label>
+	<% IssueCustomField.all.each do |field| %>
+		<label class="block">
+			<%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.include?(field) %>
+			<%=h field.name %>
+		</label>
+	<% end %>
+</p>
+<%= hidden_field_tag 'tracker[custom_field_ids][]', '' %>
+<% end %>
+
 <% if @tracker.new_record? && @trackers.any? %>
 <p><label><%= l(:label_copy_workflow_from) %></label>
 <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
index ec412245..8d5787cd 100644
--- a/test/functional/trackers_controller_test.rb
+++ b/test/functional/trackers_controller_test.rb
@@ -22,7 +22,7 @@ require 'trackers_controller'
 class TrackersController; def rescue_action(e) raise e end; end
 
 class TrackersControllerTest < ActionController::TestCase
-  fixtures :trackers, :projects, :projects_trackers, :users, :issues
+  fixtures :trackers, :projects, :projects_trackers, :users, :issues, :custom_fields
   
   def setup
     @controller = TrackersController.new
@@ -45,10 +45,11 @@ class TrackersControllerTest < ActionController::TestCase
   end
 
   def test_post_new
-    post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''] }
+    post :new, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
     assert_redirected_to '/trackers/list'
     tracker = Tracker.find_by_name('New tracker')
     assert_equal [1], tracker.project_ids.sort
+    assert_equal [1, 6], tracker.custom_field_ids
     assert_equal 0, tracker.workflows.count
   end