diff --git a/VERSION b/VERSION
index 0055c191..a73c7d74 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.7 (2012-05-03 17:55:38) dev
+Version 1.99.7 (2012-05-03 18:48:09) dev
diff --git a/gluon/contrib/autolinks.py b/gluon/contrib/autolinks.py
index 33867596..2ceb4544 100644
--- a/gluon/contrib/autolinks.py
+++ b/gluon/contrib/autolinks.py
@@ -158,7 +158,7 @@ def expand_one(url,cdict):
 def expand_html(html,cdict=None):
     soup = BeautifulSoup(html)
     for txt in soup.findAll(text=True):
-        if txt.parent.name != 'a':
+        if not txt.parent.name in ('a','script','pre','code','embed','object','audio','video'):
             ntxt = regex_link.sub(
                 lambda match: expand_one(match.group(0),cdict), txt)
             txt.replaceWith(BeautifulSoup(ntxt))