diff --git a/mozilla/webtools/addons/public/htdocs/htaccess.dist b/mozilla/webtools/addons/public/htdocs/htaccess.dist
index 2ec1b2435ff..ac99f3a211b 100644
--- a/mozilla/webtools/addons/public/htdocs/htaccess.dist
+++ b/mozilla/webtools/addons/public/htdocs/htaccess.dist
@@ -9,3 +9,43 @@ php_value auto_prepend_file init.php
 
 # Finish script that calls $tpl->display for global Smarty object.
 php_value auto_append_file finish.php
+
+# Rewrite engine must be used to simplify URLs so they are human readable.
+RewriteEngine On
+RewriteBase /YOURPATH/public/htdocs
+
+# Send rss/* to rss.php.
+# Example:
+#     /rss/firefox/extensions/popular/ -> rss.php?app=firefox&type=extensions&list=popular
+RewriteRule ^rss/(\w+)/(\w+)/(\w+)[/]{0,1}$ rss.php?app=$1&type=$2&list=$3
+
+# Rewrite to addon.php if all we have is a numerical id after appname.
+# Example:
+#     /firefox/220/ -> addon.php?app=firefox&id=220
+RewriteRule ^(\w+)/(\d+)[/]{0,1}$ addon.php?app=$1&id=$2
+
+# Rewrite to an addon-specific page, passing app and id.
+# Example:
+#     /firefox/220/previews/ -> previews.php?app=firefox&id=220
+RewriteRule ^(\w+)/(\d+)/(\w+)[/]{0,1}$ $3.php?app=$1&id=$2
+
+# Rewrite to addon.php if there is a name given plus overview (special case for addon.php).
+# Example:
+#     /firefox/flashgot/overview/ -> addon.php?app=firefox&name=flashgot
+RewriteRule ^(\w+)/(\w+)/overview[/]{0,1}$ addon.php?app=$1&name=$2
+
+# Rewrite to addon-specific page, passing app and addon name.
+# Example:
+#     /firefox/flashgot/previews/ -> previews.php?app=firefox&name=flashgot
+RewriteRule ^(\w+)/(\w+)/(\w+)[/]{0,1}$ $3.php?app=$1&name=$2
+
+# Rewrite top-level pages.
+# Examples:
+#     /firefox/extensions/ -> extensions.php?app=firefox
+#     /firefox/themes/ -> themes.php?app=firefox
+RewriteRule ^(\w+)/([\w-]+)[/]{0,1}$ $2.php?app=$1
+
+# Rewrite for main page & app.
+# Example:
+#    /firefox/ -> /?app=firefox
+RewriteRule ^(\w+)[/]{0,1}$ index.php?app=$1