diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7dfb8f21e4c16c2cb043526064324adc7381760f..5e0a10a37856d56c44c2203f0f233d6abcc1bdfc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -30,6 +30,7 @@ Moved Panels stylizer to CTools. You must update CTools at the same time as Pane
 #823216 by jonathan1055: Put quotes around url() in rounded corners CSS.
 #603150 by hefox: Protect against the panels node add form being used in unusual places.
 #841824 by levacjeep: Extend panels_edit and panels_edit_layout to allow more options with the $destination.
+#842976 by drewish: Make sure the theme knows path and file information for plugin supplied themes.
 
 Panels 6.x-3.5 (2010-May-28)
 ==============
diff --git a/panels.module b/panels.module
index a199cefc1274b75a34030877a1c7048a24e92baf..9dc659b36160f39cc35964dd3b9467ed08ac8d89 100644
--- a/panels.module
+++ b/panels.module
@@ -73,6 +73,7 @@ function panels_theme() {
         $theme[$data[$callback]] = array(
           'arguments' => array('css_id' => NULL, 'content' => NULL, 'settings' => NULL, 'display' => NULL, 'layout' => NULL, 'renderer' => NULL),
           'path' => $data['path'],
+          'file' => $data['file'],
         );
 
         // if no theme function exists, assume template.
@@ -89,6 +90,8 @@ function panels_theme() {
     if (!empty($data['render pane'])) {
       $theme[$data['render pane']] = array(
         'arguments' => array('output' => NULL, 'pane' => NULL, 'display' => NULL, 'style' => NULL),
+        'path' => $data['path'],
+        'file' => $data['file'],
       );
     }
     // If we're in legacy mode, include the old callback key for legacy styles.
@@ -96,12 +99,16 @@ function panels_theme() {
       if (!empty($data['render panel'])) {
         $theme[$data['render panel']] = array(
           'arguments' => array('display' => NULL, 'panel_id' => NULL, 'panes' => NULL, 'settings' => NULL, 'style' => NULL),
+          'path' => $data['path'],
+          'file' => $data['file'],
         );
       }
     }
     if (!empty($data['render region'])) {
       $theme[$data['render region']] = array(
         'arguments' => array('display' => NULL, 'region_id' => NULL, 'panes' => NULL, 'settings' => NULL, 'style' => NULL),
+        'path' => $data['path'],
+        'file' => $data['file'],
       );
     }