diff --git a/bibtex/bst/gost/gost71s.bst b/bibtex/bst/gost/gost71s.bst
index f515777..a9c3935 100644
--- a/bibtex/bst/gost/gost71s.bst
+++ b/bibtex/bst/gost/gost71s.bst
@@ -6,8 +6,8 @@
 %%
 %% gost.dtx  (with options: `gost71s')
 %% 
-%% Copyright 1996-2003 Maksym Polyakov.
-%% Version 2003.10.07
+%% Copyright 1996-2005 Maksym Polyakov.
+%% Version 2005.08.12
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
@@ -20,6 +20,8 @@
 %% Please, send bug reports via e-mail:
 %%   polyama at auburn dot edu
 %% 
+%% 2005.08.12 Bug fix (long annote)
+%% 
 %% 2003.06.06 contributions by Konstantin Vorontsov:
 %% New ENTRY "annote" added for output annotations.
 %% New commands BibUrl, BibAnnote added for customize urls and annotations.
@@ -30,6 +32,8 @@
 %% 2003.10.07
 %% Some bug fixes in names and date formatting.
 %% 
+%% 2003.10.07
+%% Bug fix in INPROCEEDINGS.
 %% 
 %%
 %% This bibliography style attempts
@@ -113,7 +117,8 @@ FUNCTION {change.language}
 }
 
 FUNCTION {output.nonnull}
-{ 's :=
+%%%{ 's :=
+{ swap$
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
@@ -147,7 +152,7 @@ FUNCTION {output.nonnull}
       mid.sentence 'output.state :=
     }
   if$
-  s
+%%%  s
 }
 
 FUNCTION {output}
@@ -533,6 +538,8 @@ FUNCTION {format.names}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -569,6 +576,8 @@ FUNCTION {format.names.rev}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -1139,6 +1148,8 @@ FUNCTION {inproceedings}
   author.before
   new.sentence
   format.title "title" output.check
+  new.slash
+  author.after
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
diff --git a/bibtex/bst/gost/gost71u.bst b/bibtex/bst/gost/gost71u.bst
index 7b0829b..1db7879 100644
--- a/bibtex/bst/gost/gost71u.bst
+++ b/bibtex/bst/gost/gost71u.bst
@@ -6,8 +6,8 @@
 %%
 %% gost.dtx  (with options: `gost71u')
 %% 
-%% Copyright 1996-2003 Maksym Polyakov.
-%% Version 2003.10.07
+%% Copyright 1996-2005 Maksym Polyakov.
+%% Version 2005.08.12
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
@@ -20,6 +20,8 @@
 %% Please, send bug reports via e-mail:
 %%   polyama at auburn dot edu
 %% 
+%% 2005.08.12 Bug fix (long annote)
+%% 
 %% 2003.06.06 contributions by Konstantin Vorontsov:
 %% New ENTRY "annote" added for output annotations.
 %% New commands BibUrl, BibAnnote added for customize urls and annotations.
@@ -30,6 +32,8 @@
 %% 2003.10.07
 %% Some bug fixes in names and date formatting.
 %% 
+%% 2003.10.07
+%% Bug fix in INPROCEEDINGS.
 %% 
 %%
 %% This bibliography style attempts
@@ -113,7 +117,8 @@ FUNCTION {change.language}
 }
 
 FUNCTION {output.nonnull}
-{ 's :=
+%%%{ 's :=
+{ swap$
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
@@ -147,7 +152,7 @@ FUNCTION {output.nonnull}
       mid.sentence 'output.state :=
     }
   if$
-  s
+%%%  s
 }
 
 FUNCTION {output}
@@ -533,6 +538,8 @@ FUNCTION {format.names}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -569,6 +576,8 @@ FUNCTION {format.names.rev}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -1139,6 +1148,8 @@ FUNCTION {inproceedings}
   author.before
   new.sentence
   format.title "title" output.check
+  new.slash
+  author.after
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
diff --git a/bibtex/bst/gost/gost780s.bst b/bibtex/bst/gost/gost780s.bst
index 6e121a6..9313731 100644
--- a/bibtex/bst/gost/gost780s.bst
+++ b/bibtex/bst/gost/gost780s.bst
@@ -6,8 +6,8 @@
 %%
 %% gost.dtx  (with options: `gost780s')
 %% 
-%% Copyright 1996-2003 Maksym Polyakov.
-%% Version 2003.10.07
+%% Copyright 1996-2005 Maksym Polyakov.
+%% Version 2005.08.12
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
@@ -20,6 +20,8 @@
 %% Please, send bug reports via e-mail:
 %%   polyama at auburn dot edu
 %% 
+%% 2005.08.12 Bug fix (long annote)
+%% 
 %% 2003.06.06 contributions by Konstantin Vorontsov:
 %% New ENTRY "annote" added for output annotations.
 %% New commands BibUrl, BibAnnote added for customize urls and annotations.
@@ -30,6 +32,8 @@
 %% 2003.10.07
 %% Some bug fixes in names and date formatting.
 %% 
+%% 2003.10.07
+%% Bug fix in INPROCEEDINGS.
 %% 
 %%
 %% This bibliography style attempts
@@ -113,7 +117,8 @@ FUNCTION {change.language}
 }
 
 FUNCTION {output.nonnull}
-{ 's :=
+%%%{ 's :=
+{ swap$
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
@@ -147,7 +152,7 @@ FUNCTION {output.nonnull}
       mid.sentence 'output.state :=
     }
   if$
-  s
+%%%  s
 }
 
 FUNCTION {output}
@@ -540,6 +545,8 @@ FUNCTION {format.names.rev}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -1104,6 +1111,8 @@ FUNCTION {inproceedings}
   author.before
   new.sentence
   format.title "title" output.check
+  new.slash
+  author.after
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
diff --git a/bibtex/bst/gost/gost780u.bst b/bibtex/bst/gost/gost780u.bst
index b33fe44..c31165d 100644
--- a/bibtex/bst/gost/gost780u.bst
+++ b/bibtex/bst/gost/gost780u.bst
@@ -6,8 +6,8 @@
 %%
 %% gost.dtx  (with options: `gost780u')
 %% 
-%% Copyright 1996-2003 Maksym Polyakov.
-%% Version 2003.10.07
+%% Copyright 1996-2005 Maksym Polyakov.
+%% Version 2005.08.12
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.2
@@ -20,6 +20,8 @@
 %% Please, send bug reports via e-mail:
 %%   polyama at auburn dot edu
 %% 
+%% 2005.08.12 Bug fix (long annote)
+%% 
 %% 2003.06.06 contributions by Konstantin Vorontsov:
 %% New ENTRY "annote" added for output annotations.
 %% New commands BibUrl, BibAnnote added for customize urls and annotations.
@@ -30,6 +32,8 @@
 %% 2003.10.07
 %% Some bug fixes in names and date formatting.
 %% 
+%% 2003.10.07
+%% Bug fix in INPROCEEDINGS.
 %% 
 %%
 %% This bibliography style attempts
@@ -113,7 +117,8 @@ FUNCTION {change.language}
 }
 
 FUNCTION {output.nonnull}
-{ 's :=
+%%%{ 's :=
+{ swap$
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
@@ -147,7 +152,7 @@ FUNCTION {output.nonnull}
       mid.sentence 'output.state :=
     }
   if$
-  s
+%%%  s
 }
 
 FUNCTION {output}
@@ -540,6 +545,8 @@ FUNCTION {format.names.rev}
             { ", " * t * }
             {
               t "others" =
+      t "~others" =
+      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -1104,6 +1111,8 @@ FUNCTION {inproceedings}
   author.before
   new.sentence
   format.title "title" output.check
+  new.slash
+  author.after
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
diff --git a/source/latex/gost/gost.dtx b/source/bibtex/gost/gost.dtx
similarity index 99%
rename from source/latex/gost/gost.dtx
rename to source/bibtex/gost/gost.dtx
index 61fab16..00e9db4 100644
--- a/source/latex/gost/gost.dtx
+++ b/source/bibtex/gost/gost.dtx
@@ -86,7 +86,8 @@ FUNCTION {change.language}
 }
 
 FUNCTION {output.nonnull}
-{ 's :=
+%%%{ 's :=
+{ swap$
   output.state mid.sentence =
     { ", " * write$ }
     { output.state after.block =
@@ -120,7 +121,7 @@ FUNCTION {output.nonnull}
       mid.sentence 'output.state :=
     }
   if$
-  s
+%%%  s
 }
 
 FUNCTION {output}
@@ -535,7 +536,9 @@ FUNCTION {format.names}
           namesleft #1 >
             { ", " * t * }
             {
-              t "others" =
+              t "others" = 
+	      t "~others" = 
+	      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -580,7 +583,9 @@ FUNCTION {format.names.rev}
           namesleft #1 >
             { ", " * t * }
             {
-              t "others" =
+              t "others" = 
+	      t "~others" = 
+	      or
                 { " " * bbl.etal * }
                 { ", " * t * }
               if$
@@ -1238,6 +1243,8 @@ FUNCTION {inproceedings}
   author.before
   new.sentence
   format.title "title" output.check
+  new.slash
+  author.after
   new.dblslash
   booktitle "booktitle" output.check
   new.slash
diff --git a/source/latex/gost/gost.ins b/source/bibtex/gost/gost.ins
similarity index 90%
rename from source/latex/gost/gost.ins
rename to source/bibtex/gost/gost.ins
index a2fb044..762ba57 100644
--- a/source/latex/gost/gost.ins
+++ b/source/bibtex/gost/gost.ins
@@ -14,8 +14,8 @@
 
 \preamble
 
-Copyright 1996-2003 Maksym Polyakov.
-Version 2003.10.07
+Copyright 1996-2005 Maksym Polyakov.
+Version 2005.08.12
                                                         
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.2
@@ -28,6 +28,8 @@ version 1999/12/01 or later.
 Please, send bug reports via e-mail:                          
   polyama at auburn dot edu                                          
 
+2005.08.12 Bug fix (long annote)
+ 
 2003.06.06 contributions by Konstantin Vorontsov:
 New ENTRY "annote" added for output annotations.
 New commands BibUrl, BibAnnote added for customize urls and annotations.
@@ -38,6 +40,8 @@ New command BibEmph added for customize emphasizing.
 2003.10.07
 Some bug fixes in names and date formatting. 
 
+2003.10.07
+Bug fix in INPROCEEDINGS. 
 
 \endpreamble