diff --git a/templates/block.tpl.php b/templates/block.tpl.php
index 357a8aa..44b490a 100644
--- a/templates/block.tpl.php
+++ b/templates/block.tpl.php
@@ -44,9 +44,9 @@
  * @ingroup themeable
  */
 ?>
-<?php print render($title_prefix); ?>
-<?php if ($block->subject): ?>
-  <?php print $block->subject ?>
-<?php endif; ?>
-<?php print render($title_suffix); ?>
-<?php print $content; ?>
+<div id="<?php print $block_html_id; ?>" class="<?php print $classes; ?>"<?php print $attributes; ?>>
+  <?php print render($title_prefix); ?>
+  <?php print $block->subject; ?>
+  <?php print render($title_suffix); ?>
+  <?php print $content; ?>
+</div>
