diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..5919d69
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,6 @@
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteRule ^page/([0-9]+)/?$ index.php?page=$1 [L]
+RewriteRule ^post/([0-9]+)/?$ index.php?post=$1 [L]
+RewriteRule ^rss/?$ rss.php [L]
+</IfModule>
\ No newline at end of file
diff --git a/index.php b/index.php
index 51d2dd9..f939fef 100644
--- a/index.php
+++ b/index.php
@@ -63,7 +63,7 @@
         $gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
         $gelato_includes .= "\t<meta name=\"generator\" content=\"gelato cms ".version()."\" />\n";
         $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
-        $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato."/rss.php\"/>\n";
+        $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
         $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
         $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/slimbox.css\" />\n";    
         $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/mootools.js\"></script>\n";
@@ -100,7 +100,7 @@
                         while($register = mysql_fetch_array($rs)) {
 								$formatedDate = date("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
                                 if ( $dateTmp != null && $formatedDate == $dateTmp ) { $formatedDate = ""; } else { $dateTmp = $formatedDate; }
-                                $permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
+								$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
                                 
 								$textile = new Textile();				
 								$register["description"] = $textile->TextileThis($register["description"]);
@@ -177,7 +177,7 @@
                         $p->limit($limit);
                         
                         $p->urlFriendly('[...]');
-                        $p->target($conf->urlGelato."/index.php/page/[...]/");
+						$p->target($conf->urlGelato.($conf->urlFriendly?"/":"/index.php/")."page/[...]/");
                         
                         $p->currentPage(isset($page_num) ? $page_num : 1);
                         $p->show();
@@ -190,7 +190,7 @@
                 $register = $tumble->getPost($id_post);
                 
 				$formatedDate = date("M d", strtotime($register["date"])+transform_offset($conf->offsetTime));
-                $permalink = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
+				$permalink = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
                 
 				$textile = new Textile();				
 				$register["description"] = $textile->TextileThis($register["description"]);
diff --git a/rss.php b/rss.php
index 94266e3..952940f 100644
--- a/rss.php
+++ b/rss.php
@@ -79,7 +79,7 @@
 					$desc = $tumble->getMp3Player($register["url"]);
 					break;
 			}
-			$url = $conf->urlGelato."/index.php/post/".$register["id_post"]."/";
+			$url = $conf->urlGelato.($conf->urlFriendly?"/post/":"/index.php/post/").$register["id_post"]."/";
 			$formatedDate = gmdate("D, d M Y H:i:s \G\M\T", strtotime($register["date"]));
 ?>