diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index ae063d60a..b39dc1c9c 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2009  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@ class MyController < ApplicationController
              'calendar' => :label_calendar,
              'documents' => :label_document_plural,
              'timelog' => :label_spent_time
-           }.freeze
+           }.merge(Redmine::Views::MyPage::Block.additional_blocks).freeze
 
   DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'], 
                       'right' => ['issuesreportedbyme'] 
@@ -108,7 +108,7 @@ class MyController < ApplicationController
     session[:page_layout] = @blocks
     %w(top left right).each {|f| session[:page_layout][f] ||= [] }
     @block_options = []
-    BLOCKS.each {|k, v| @block_options << [l(v), k.dasherize]}
+    BLOCKS.each {|k, v| @block_options << [l_or_humanize(v), k.dasherize]}
   end
   
   # Add a block to user's page
diff --git a/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml b/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
new file mode 100644
index 000000000..c19e49739
--- /dev/null
+++ b/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
@@ -0,0 +1,3 @@
+<h3>Sample block</h3>
+
+You are <strong><%= h(User.current) %></strong> and this is a sample block for My Page added from a plugin.
diff --git a/lib/redmine/views/my_page/block.rb b/lib/redmine/views/my_page/block.rb
new file mode 100644
index 000000000..a9a52a052
--- /dev/null
+++ b/lib/redmine/views/my_page/block.rb
@@ -0,0 +1,32 @@
+# Redmine - project management software
+# Copyright (C) 2006-2009  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module Redmine
+  module Views
+    module MyPage
+      module Block
+        def self.additional_blocks
+          @@additional_blocks ||= Dir.glob("#{RAILS_ROOT}/vendor/plugins/*/app/views/my/blocks/_*.{rhtml,erb}").inject({}) do |h,file|
+            name = File.basename(file).split('.').first.gsub(/^_/, '')
+            h[name] = name
+            h
+          end
+        end
+      end
+    end
+  end
+end