Index: /branches/release-40/lib/MT/Upgrade.pm
===================================================================
--- /branches/release-40/lib/MT/Upgrade.pm (revision 2627)
+++ /branches/release-40/lib/MT/Upgrade.pm (revision 2637)
@@ -893,4 +893,22 @@
                     require MT::CMS::Blog;
                     MT::CMS::Blog::update_publishing_profile( $App, $blog );
+                    require MT::Template;
+                    my @tmpls = MT::Template->load( { blog_id => $blog->id } );
+                    foreach my $tmpl (@tmpls) {
+
+                        if ( $tmpl->build_dynamic ) {
+                            require MT::TemplateMap;
+                            require MT::PublishOption;
+                            $tmpl->build_type( MT::PublishOption::DYNAMIC() );
+                            $tmpl->save;
+                            my @maps = MT::TemplateMap->load(
+                                { template_id => $tmpl->id } );
+                            foreach my $map (@maps) {
+                                $map->build_type(
+                                    MT::PublishOption::DYNAMIC() );
+                                $map->save;
+                            }
+                        }
+                    }
                     return 0;
                 },
Index: /branches/release-40/lib/MT/Template.pm
===================================================================
--- /branches/release-40/lib/MT/Template.pm (revision 2396)
+++ /branches/release-40/lib/MT/Template.pm (revision 2637)
@@ -375,4 +375,5 @@
     require MT::PublishOption;
     return 1 if $tmpl->build_type == MT::PublishOption::DYNAMIC();
+    return $tmpl->SUPER::build_dynamic;
 }