diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 3ee457ff0..b2c3eedfe 100644
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -279,7 +279,12 @@ sub sessioncgi ($$) { #{{{
 					$type=$ext;
 				}
 				
-				$destfile.=".".$type;
+				if (! $config{indexpages}) {
+					$destfile.=".".$type;
+				}
+				else {
+					$destfile.="/index.".$type;
+				}
 			}
 			push @torename, {
 				src => $src,