diff -ru pukiwiki-1.4.4.puny/lib/html.php pukiwiki-1.4.4/lib/html.php
--- pukiwiki-1.4.4.puny/lib/html.php	2005-01-02 18:54:22.000000000 +0900
+++ pukiwiki-1.4.4/lib/html.php	2005-01-02 19:09:39.000000000 +0900
@@ -24,13 +24,13 @@
 	$link_add      = "$script?cmd=add&page=$r_page";
 	$link_edit     = "$script?cmd=edit&page=$r_page";
 	$link_diff     = "$script?cmd=diff&page=$r_page";
-	$link_top      = "$script?".punyencode($defaultpage);
+	$link_top      = punyencode($defaultpage).'.html';
 	$link_list     = "$script?cmd=list";
 	$link_filelist = "$script?cmd=filelist";
 	$link_search   = "$script?cmd=search";
-	$link_whatsnew = "$script?".punyencode($whatsnew);
+	$link_whatsnew = punyencode($whatsnew).'.html';
 	$link_backup   = "$script?cmd=backup&page=$r_page";
-	$link_help     = "$script?".punyencode($help_page);
+	$link_help     = punyencode($help_page).'.html';
 	$link_rss      = "$script?cmd=rss10";
 	$link_freeze   = "$script?cmd=freeze&page=$r_page";
 	$link_unfreeze = "$script?cmd=unfreeze&page=$r_page";
@@ -232,8 +232,8 @@
 		$s_page = htmlspecialchars($page);
 		$passage = get_passage($lastmod);
 		$_links[] = $tag ?
-			"<a href=\"$script?$r_page\" title=\"$s_page $passage\">$s_page</a>" :
-			"<a href=\"$script?$r_page\">$s_page</a>$passage";
+			"<a href=\"$r_page.html\" title=\"$s_page $passage\">$s_page</a>" :
+			"<a href=\"$r_page.html\">$s_page</a>$passage";
 	}
 
 	if (count($_links) == 0)
diff -ru pukiwiki-1.4.4.puny/lib/make_link.php pukiwiki-1.4.4/lib/make_link.php
--- pukiwiki-1.4.4.puny/lib/make_link.php	2005-01-02 18:54:22.000000000 +0900
+++ pukiwiki-1.4.4/lib/make_link.php	2005-01-02 18:58:06.000000000 +0900
@@ -670,7 +670,7 @@
 	{
 		$passage = get_pg_passage($page,FALSE);
 		$title = $link_compact ? '' : " title=\"$s_page$passage\"";
-		return "<a href=\"$script?$r_page$anchor\"$title>$s_alias</a>";
+		return "<a href=\"$r_page.html$anchor\"$title>$s_alias</a>";
 	}
 	else
 	{
diff -ru pukiwiki-1.4.4.puny/plugin/calendar2.inc.php pukiwiki-1.4.4/plugin/calendar2.inc.php
--- pukiwiki-1.4.4.puny/plugin/calendar2.inc.php	2005-01-02 18:54:22.000000000 +0900
+++ pukiwiki-1.4.4/plugin/calendar2.inc.php	2005-01-02 18:59:55.000000000 +0900
@@ -121,7 +121,7 @@
 		}
 
 		if (is_page($page)) {
-			$link = "<a href=\"$script?$r_page\" title=\"$s_page\"><strong>$day</strong></a>";
+			$link = "<a href=\"$r_page.html\" title=\"$s_page\"><strong>$day</strong></a>";
 		}
 		else {
 			$link = "<a class=\"small\" href=\"$script?cmd=edit&amp;page=$r_page&amp;refer=$r_base\" title=\"$s_page\">$day</a>";
diff -ru pukiwiki-1.4.4.puny/plugin/edit.inc.php pukiwiki-1.4.4/plugin/edit.inc.php
--- pukiwiki-1.4.4.puny/plugin/edit.inc.php	2005-01-02 18:54:22.000000000 +0900
+++ pukiwiki-1.4.4/plugin/edit.inc.php	2005-01-02 19:02:06.000000000 +0900
@@ -117,7 +117,7 @@
 		page_write($page, $postdata, $notimestamp);
 
 		if ($postdata) {
-			header("Location: $script?" . punyencode($page));
+			header('Location: '.punyencode($page).'.html');
 			exit;
 		}
 
diff -ru pukiwiki-1.4.4.puny/plugin/recent.inc.php pukiwiki-1.4.4/plugin/recent.inc.php
--- pukiwiki-1.4.4.puny/plugin/recent.inc.php	2005-01-02 18:54:23.000000000 +0900
+++ pukiwiki-1.4.4/plugin/recent.inc.php	2005-01-02 19:02:56.000000000 +0900
@@ -52,7 +52,7 @@
 			// No need to link itself, notifies where you just read
 			$items .= " <li><span title=\"$s_page $pg_passage\">$s_page</span></li>\n";
 		} else {
-			$items .= " <li><a href=\"$script?$r_page\" title=\"$s_page $pg_passage\">$s_page</a></li>\n";
+			$items .= " <li><a href=\"$r_page.html\" title=\"$s_page $pg_passage\">$s_page</a></li>\n";
 		}
 	}
 	if (! empty($lines)) $items .= "</ul>\n";
diff -ru pukiwiki-1.4.4.puny/plugin/rename.inc.php pukiwiki-1.4.4/plugin/rename.inc.php
--- pukiwiki-1.4.4.puny/plugin/rename.inc.php	2005-01-02 18:54:23.000000000 +0900
+++ pukiwiki-1.4.4/plugin/rename.inc.php	2005-01-02 19:03:56.000000000 +0900
@@ -472,7 +472,7 @@
 	{
 		$page = RENAME_LOGPAGE;
 	}
-	header("Location: $script?" . punyencode($page));
+	header('Location: '.punyencode($page).'.html');
 	die();
 }
 
diff -ru pukiwiki-1.4.4.puny/plugin/topicpath.inc.php pukiwiki-1.4.4/plugin/topicpath.inc.php
--- pukiwiki-1.4.4.puny/plugin/topicpath.inc.php	2005-01-02 18:54:23.000000000 +0900
+++ pukiwiki-1.4.4/plugin/topicpath.inc.php	2005-01-02 19:04:28.000000000 +0900
@@ -48,7 +48,7 @@
 		$landing = punyencode(join('/', $parts));
 		$element = htmlspecialchars(array_pop($parts));
 		if ($b_link)  {
-			$topic_path[] = "<a href=\"$script?$landing\">$element</a>";
+			$topic_path[] = "<a href=\"$landing.html\">$element</a>";
 		} else {
 			$topic_path[] = $element;
 			$b_link = TRUE; // Maybe reacheable once at a time
diff -ru pukiwiki-1.4.4.puny/plugin/yetlist.inc.php pukiwiki-1.4.4/plugin/yetlist.inc.php
--- pukiwiki-1.4.4.puny/plugin/yetlist.inc.php	2005-01-02 18:54:23.000000000 +0900
+++ pukiwiki-1.4.4/plugin/yetlist.inc.php	2005-01-02 19:05:01.000000000 +0900
@@ -46,7 +46,7 @@
 			$r_refer = punyencode($_refer);
 			$s_refer = htmlspecialchars($_refer);
 
-			$link_refs[] = "<a href=\"$script?$r_refer\">$s_refer</a>";
+			$link_refs[] = "<a href=\"$r_refer.html\">$s_refer</a>";
 		}
 		$link_ref = join(' ',$link_refs);
 		// 参照元ページが複数あった場合、referは最後のページを指す(いいのかな)
diff -ru pukiwiki-1.4.4.puny/skin/pukiwiki.skin.ja.php pukiwiki-1.4.4/skin/pukiwiki.skin.ja.php
--- pukiwiki-1.4.4.puny/skin/pukiwiki.skin.ja.php	2005-01-02 18:54:23.000000000 +0900
+++ pukiwiki-1.4.4/skin/pukiwiki.skin.ja.php	2005-01-02 19:12:10.000000000 +0900
@@ -45,7 +45,7 @@
  <h1 class="title"><?php echo $page ?></h1>
 
 <?php if ($is_page) { ?>
- <a href="<?php echo "$script?$r_page" ?>"><span class="small"><?php echo "$script?$r_page" ?></span></a>
+ <a href="<?php echo "$r_page.html" ?>"><span class="small"><?php echo "$r_page.html" ?></span></a>
 <?php } ?>
 
 </div>
@@ -54,7 +54,7 @@
 <div id="navigator">
 
 <?php if ($is_page) { ?>
- [ <a href="<?php echo "$script?$r_page" ?>">リロード</a> ]
+ [ <a href="<?php echo "$r_page.html" ?>">リロード</a> ]
  &nbsp;
  [ <a href="<?php echo "$script?plugin=newpage&amp;refer=$r_page" ?>">新規</a>
  | <a href="<?php echo $link_edit ?>">編集</a>
@@ -147,7 +147,7 @@
 <div id="toolbar">
 
 <?php if ($is_page) { ?>
- <a href="<?php echo "$script?$r_page" ?>"><img src="<?php echo IMAGE_DIR ?>reload.png" width="20" height="20" alt="リロード" title="リロード" /></a>
+ <a href="<?php echo "$r_page.html" ?>"><img src="<?php echo IMAGE_DIR ?>reload.png" width="20" height="20" alt="リロード" title="リロード" /></a>
  &nbsp;
  <a href="<?php echo $script ?>?plugin=newpage"><img src="<?php echo IMAGE_DIR ?>new.png" width="20" height="20" alt="新規" title="新規" /></a>
  <a href="<?php echo $link_edit ?>"><img src="<?php echo IMAGE_DIR ?>edit.png" width="20" height="20" alt="編集" title="編集" /></a>