--- robots.txt.orig	2012-02-29 11:44:11.000000000 -0500
+++ robots.txt	2012-04-01 21:25:28.000000000 -0400
@@ -16,16 +16,23 @@
 # For syntax checking, see:
 # http://www.sxw.org.uk/computing/robots/check.html
 
+# Sitemaps
+Sitemap: /sitemap.xml
+
 User-agent: *
 Crawl-delay: 10
-# Directories
+#
+# Core directories
+#
 Disallow: /includes/
 Disallow: /misc/
 Disallow: /modules/
 Disallow: /profiles/
 Disallow: /scripts/
 Disallow: /themes/
-# Files
+#
+# Core files
+#
 Disallow: /CHANGELOG.txt
 Disallow: /cron.php
 Disallow: /INSTALL.mysql.txt
@@ -37,23 +44,142 @@
 Disallow: /update.php
 Disallow: /UPGRADE.txt
 Disallow: /xmlrpc.php
-# Paths (clean URLs)
+#
+# Core paths
+#
+Disallow: /admin$
+Disallow: /?q=admin$
+Disallow: /*/admin$
+Disallow: /*/?q=admin$
+#
 Disallow: /admin/
-Disallow: /comment/reply/
-Disallow: /filter/tips/
-Disallow: /logout/
-Disallow: /node/add/
-Disallow: /search/
-Disallow: /user/register/
-Disallow: /user/password/
-Disallow: /user/login/
-# Paths (no clean URLs)
 Disallow: /?q=admin/
-Disallow: /?q=comment/reply/
+Disallow: /*/admin/
+Disallow: /*/?q=admin/
+#
+Disallow: /*/feed$
+#
+Disallow: /filter/tips/
 Disallow: /?q=filter/tips/
+Disallow: /*/filter/tips/
+Disallow: /*/?q=filter/tips/
+#
+Disallow: /logout$
+Disallow: /?q=logout$
+Disallow: /*/logout$
+Disallow: /*/?q=logout$
+#
+Disallow: /logout/
 Disallow: /?q=logout/
-Disallow: /?q=node/add/
+Disallow: /*/logout/
+Disallow: /*/?q=logout/
+#
+Disallow: /node/add
+Disallow: /?q=node/add
+Disallow: /*/node/add
+Disallow: /*/?q=node/add
+#
+Disallow: /user$
+Disallow: /?q=user$
+Disallow: /*/user$
+Disallow: /*/?q=user$
+#
+Disallow: /user/register
+Disallow: /?q=user/register
+Disallow: /*/user/register
+Disallow: /*/?q=user/register
+#
+Disallow: /user/password
+Disallow: /?q=user/password
+Disallow: /*/user/password
+Disallow: /*/?q=user/password
+#
+Disallow: /user/login
+Disallow: /?q=user/login
+Disallow: /*/user/login
+Disallow: /*/?q=user/login
+#
+# Core module aggregator
+#
+Disallow: /aggregator/
+Disallow: /?q=aggregator/
+Disallow: /*/aggregator/
+Disallow: /*/?q=aggregator/
+#
+# Core module comment
+#
+Disallow: /comment/reply
+Disallow: /?q=comment/reply
+Disallow: /*/comment/reply
+Disallow: /*/?q=comment/reply
+#
+# Core module search
+#
+Disallow: /search$
+Disallow: /?q=search$
+Disallow: /*/search$
+Disallow: /*/?q=search$
+#
+Disallow: /search/
 Disallow: /?q=search/
-Disallow: /?q=user/password/
-Disallow: /?q=user/register/
-Disallow: /?q=user/login/
+Disallow: /*/search/
+Disallow: /*/?q=search/
+#
+# Core module tracker
+#
+Disallow: /*/track$
+#
+# Module blocks404
+#
+Disallow: /blocks404$
+Disallow: /?q=blocks404$
+Disallow: /*/blocks404$
+Disallow: /*/?q=blocks404$
+#
+# Module boost
+#
+Disallow: /boost_stats.php
+#
+# Module calendar
+#
+Disallow: /calendar/
+Disallow: /?q=calendar/
+Disallow: /*/calendar/
+Disallow: /*/?q=calendar/
+#
+# Module print
+#
+Disallow: /print/
+Disallow: /?q=print/
+Disallow: /*/print/
+Disallow: /*/?q=print/
+#
+Disallow: /printpdf/
+Disallow: /?q=printpdf/
+Disallow: /*/printpdf/
+Disallow: /*/?q=printpdf/
+#
+# Module translation404
+#
+Disallow: /translation_not_found$
+Disallow: /?q=translation_not_found$
+Disallow: /*/translation_not_found$
+Disallow: /*/?q=translation_not_found$
+#
+# Module ubercart
+#
+Disallow: /cart$
+Disallow: /?q=cart$
+Disallow: /*/cart$
+Disallow: /*/?q=cart$
+#
+Disallow: /cart/
+Disallow: /?q=cart/
+Disallow: /*/cart/
+Disallow: /*/?q=cart/
+#
+# Miscellaneous
+#
+Disallow: /*sort=
+
+# END