diff --git a/panels.module b/panels.module
index 486d2431caa135e42c28fde01972cb343fd36bc7..b136b64673bac501377b58213f94a746104eb1b7 100644
--- a/panels.module
+++ b/panels.module
@@ -1236,6 +1236,9 @@ function template_preprocess_panels_pane(&$vars) {
     }
   }
 
+  $vars['pane_prefix'] = !empty($content->pane_prefix) ? $content->pane_prefix : '';
+  $vars['pane_suffix'] = !empty($content->pane_suffix) ? $content->pane_suffix : '';
+
   $vars['title'] = !empty($content->title) ? $content->title : '';
 
   $vars['feeds'] = !empty($content->feeds) ? implode(' ', $content->feeds) : '';
diff --git a/templates/panels-pane.tpl.php b/templates/panels-pane.tpl.php
index d7c93ab7da15440b683f1390241ed1789792a8d2..e909cfa1d373ab7bfe9e012ac4e191b41205da19 100644
--- a/templates/panels-pane.tpl.php
+++ b/templates/panels-pane.tpl.php
@@ -17,6 +17,9 @@
  *   data including the contexts and all of the other panes being displayed.
  */
 ?>
+<?php if ($pane_prefix): ?>
+  <?php print $pane_prefix; ?>
+<?php endif; ?>
 <div class="<?php print $classes; ?>" <?php print $id; ?>>
   <?php if ($admin_links): ?>
     <?php print $admin_links; ?>
@@ -48,3 +51,6 @@
     </div>
   <?php endif; ?>
 </div>
+<?php if ($pane_suffix): ?>
+  <?php print $pane_suffix; ?>
+<?php endif; ?>