--- /usr/share/texmf/tex/context/bib/bibl-aps.tex	2006-11-16 02:02:47.000000000 +0100
+++ bibl-aps.tex	2007-04-18 23:42:21.917086750 +0200
@@ -14,7 +14,7 @@
 \setupcite
        [author,year]
        [\c!andtext={ and },
-        \c!otherstext={ et al.},
+        \c!otherstext={\ et al.},
         \c!pubsep={, },
         \c!lastpubsep={ and },
         \c!compress=\v!no,
@@ -25,7 +25,7 @@
 \setupcite
        [authoryear]
        [\c!andtext={ and },
-        \c!otherstext={ et al.},
+        \c!otherstext={\ et al.},
         \c!pubsep={, },
         \c!lastpubsep={ and },
         \c!compress=\v!yes,
@@ -36,7 +36,7 @@
 \setupcite
        [authoryears]
        [\c!andtext={ and },
-        \c!otherstext={ et al.},
+        \c!otherstext={\ et al.},
         \c!pubsep={, },
         \c!lastpubsep={ and },
         \c!compress=\v!yes,
@@ -47,7 +47,7 @@
 \setupcite
        [key,serial,authornum,page,short,type,doi,url]
        [\c!andtext={ and },
-        \c!otherstext={ et al.},
+        \c!otherstext={\ et al.},
         \c!pubsep={, },
         \c!lastpubsep={ and },
         \c!compress=\v!no,
@@ -58,7 +58,7 @@
 \setupcite
        [num]
        [\c!andtext={ and },
-        \c!otherstext={ et al.},
+        \c!otherstext={\ et al.},
         \c!pubsep={, },
         \c!lastpubsep={ and },
         \c!compress=\v!yes,
@@ -94,9 +94,9 @@
     \c!authoretaldisplay=1,
     \c!editoretaldisplay=1,
     \c!artauthoretaldisplay=1,
-    \c!authoretaltext={ {\it et al.\/}},
-    \c!editoretaltext={ {\it  et al.\/}},
-    \c!artauthoretaltext={ {\it et al.\/}}]
+    \c!authoretaltext={\ {\it et al.\/}},
+    \c!editoretaltext={\ {\it  et al.\/}},
+    \c!artauthoretaltext={\ {\it et al.\/}}]
 
 \def\maybeyear#1{}
 
@@ -438,4 +438,4 @@
    \insertNote{\unskip. }{.}{\unskip.}%
 }
 
-\protect
\ No newline at end of file
+\protect
--- /usr/share/texmf/tex/context/bib/t-bib.tex	2006-12-08 12:46:44.000000000 +0100
+++ t-bib.tex	2007-04-19 00:10:08.653251250 +0200
@@ -497,10 +497,15 @@
 
 \processcommacommand[\bibcommandlist]\simplebibdef
 
+\def\insertdoi#1#2#3%
+    {{\bibdoifelse{\@@pb@doi}%
+       {\edef\ascii{\@EA\detokenize\@EA{\@@pb@doi}}%
+        #1\@EA\gotoDOI{\@@pb@thekey}{\ascii}#2}{#3}}}
+
 \def\insertbiburl#1#2#3%
     {{\bibdoifelse{\@@pb@biburl}%
        {\edef\ascii{\@EA\detokenize\@EA{\@@pb@biburl}}%
-        #1\@EA\hyphenatedurl\@EA{\ascii}#2}{#3}}}
+        #1\@EA\gotoURL{\@@pb@thekey}{\ascii}#2}{#3}}}
 
 \def\insertmonth#1#2#3%
   {\bibdoifelse{\@@pb@month}%
@@ -1636,7 +1641,9 @@
 
 \def\gotoDOI#1#2%
   {\ifbibinteractionelse
-     {\useURL[bibfoo#1][http://dx.doi.org/#2]\goto{\url[bibfoo#1]}[url(bibfoo#1)]}
+     {\useURL[bibfooDoi#1][#2]%
+      \useURL[bibfoo#1][http://dx.doi.org/#2]%
+      \goto{\url[bibfooDoi#1]}[url(bibfoo#1)]}
      {\hyphenatedurl{#2}}}
 
 \def\bibdoiref[#1]%
@@ -1787,4 +1794,4 @@
 
 \preloadbiblist
 
-\protect \endinput
\ No newline at end of file
+\protect \endinput