diff --git a/docs/NEWS b/docs/NEWS
index 5a99fc20..e1d7164f 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,8 @@
 Version 1.6 ()
 ------------------------------------------------------------------------
 
+    * TPL fixes for upcoming Smarty3, thanks to timbalu
+    
     * Experimental: Config-Groups for template and plugin options,
       currently mimics fold in/out of global configuration.
       Usage through "config_groups", examples are in config.inc.php of
diff --git a/templates/bulletproof/entries_summary.tpl b/templates/bulletproof/entries_summary.tpl
index 4caec09c..9dccd58b 100644
--- a/templates/bulletproof/entries_summary.tpl
+++ b/templates/bulletproof/entries_summary.tpl
@@ -2,8 +2,8 @@
 <div class="serendipity_Entry_Date">
     <h3 class='serendipity_date'>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B, %Y"}</h3>
     <div class="serendipity_entry archive_summary_entry">
-        {foreach from=$entries item="entries"}
-            {foreach from=$entries.entries item="entry"}
+        {foreach from=$entries item="sentries"}
+            {foreach from=$sentries.entries item="entry"}
                 <dl class="archive_summary {cycle values='archive_summary_odd,archive_summary_even'}">
                     <dt class="archive_summary_title"><a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></dt>
                     <dd class="archive_summary_postdate">{$entry.timestamp|@formatTime:$template_option.date_format}</dd>
diff --git a/templates/default/admin/media_choose.tpl b/templates/default/admin/media_choose.tpl
index 055e4a2a..0763a963 100644
--- a/templates/default/admin/media_choose.tpl
+++ b/templates/default/admin/media_choose.tpl
@@ -104,7 +104,7 @@
             if (newname = prompt('{$CONST.ENTER_NEW_NAME}' + fname, fname)) {ldelim}
                 newloc = '?{$media.token_url}&serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[fid]='+ escape(id) + '&serendipity[newname]='+ escape(newname);
                 location.href=newloc;
-            }
+            {rdelim}
         {rdelim}
 {/if}
 
diff --git a/templates/default/admin/media_pane.tpl b/templates/default/admin/media_pane.tpl
index 1fff94a5..96665968 100644
--- a/templates/default/admin/media_pane.tpl
+++ b/templates/default/admin/media_pane.tpl
@@ -120,7 +120,7 @@
             <td>{$CONST.SORT_ORDER}</td>
             <td><select name="serendipity[sortorder][ordermode]">
                     <option value="DESC" {if $media.sortorder.ordermode == 'DESC'}selected="selected"{/if}>{$CONST.SORT_ORDER_DESC}</option>
-                    <option value="ASC"  {if $media.sortorder.ordermode == 'ASC'}selected="selected"{/if}>{$CONST.SORT_ORDER_ASC }</option>
+                    <option value="ASC"  {if $media.sortorder.ordermode == 'ASC'}selected="selected"{/if}>{$CONST.SORT_ORDER_ASC}</option>
                 </select>
             </td>
             <td>{$CONST.FILES_PER_PAGE}</td>
diff --git a/templates/default/admin/media_upload.tpl b/templates/default/admin/media_upload.tpl
index e5d96d9a..883d795b 100644
--- a/templates/default/admin/media_upload.tpl
+++ b/templates/default/admin/media_upload.tpl
@@ -26,7 +26,7 @@ function showNodes(n) {ldelim}
 
         default:
             html += 'Type is ' + n.nodeType + ', Content is <strong>' + n.nodeValue + '<\/strong>';
-    }
+    {rdelim}
 
     if (n.hasChildNodes()) {ldelim}
         html += '\n<ol>\n';