diff --git a/lib/ChangeLog b/lib/ChangeLog
index 85049f1170..500f996625 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-08  Mike Ressler  <mike.ressler@alum.mit.edu>
+
+	* layouts/aastex.layout: Updated for AASTeX 5.2
+
 2005-02-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* reLyX/configure.ac: use AC_CANONICAL_TARGET; use 
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index e0374e2566..9345e59505 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -27,6 +27,7 @@
 #                         example files are available.
 # Version 1.1   7/25/99 - Changed \url to take advantage of new layout option.
 # Version 1.2   4/18/02 - Updated for natbib in 1.2.0
+# Version 1.3   5/7/04  - Updated for AASTeX 5.2
 
 
 Columns                 1
@@ -137,6 +138,14 @@ End
 Style NoteToEditor
 End
 
+Style Facility
+End
+
+Style Objectname
+End
+
+Style Dataset
+End
 
 # OK, now we have a more or less consistent Ordering. Now fill the
 # definitions. First, the standard includes
@@ -535,7 +544,6 @@ Style FigCaption
 	Margin                First_Dynamic
 	LatexType             Command
 	LatexName             figcaption
-	LatexParam            [FileName]
 	LabelSep              xx
 	ParSkip               0.4
 	TopSep                0.5
@@ -543,4 +551,86 @@ Style FigCaption
 	AlignPossible         Block, Left
 	LabelType             Static
 	LabelString           "Fig. --- "
+	OptionalArgs          1
 End
+
+# Facility style definition
+Style Facility
+	LeftMargin            MMM
+	Margin                Dynamic
+	LatexType             Command
+	InTitle               0
+	LatexName             facility
+	ParSkip               0.4
+	BottomSep             0.4
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	LabelType             Static
+	LabelSep              M
+	LabelString           "Facility:"
+	Font
+	  Family              Roman
+	  Shape               Up
+	  Size                Normal
+	EndFont
+	LabelFont
+	  Family              Roman
+	  Shape               Italic
+	  Size                Normal
+	EndFont
+End
+
+# Objectname style definition
+Style Objectname
+	LeftMargin            MMM
+	Margin                Dynamic
+	LatexType             Command
+	InTitle               0
+	LatexName             objectname
+	ParSkip               0.4
+	BottomSep             0.4
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	LabelType             Static
+	LabelSep              M
+	LabelString           "Obj:"
+	OptionalArgs          1
+	Font
+	  Family              Roman
+	  Shape               Up
+	  Size                Normal
+	EndFont
+	LabelFont
+	  Family              Roman
+	  Shape               Italic
+	  Size                Normal
+	EndFont
+End
+
+# Dataset style definition
+Style Dataset
+	LeftMargin            MMM
+	Margin                Dynamic
+	LatexType             Command
+	InTitle               0
+	LatexName             dataset
+	ParSkip               0.4
+	BottomSep             0.4
+	Align                 Block
+	AlignPossible         Block, Left, Right, Center
+	LabelType             Static
+	LabelSep              M
+	LabelString           "Dataset:"
+	OptionalArgs          1
+	Font
+	  Family              Roman
+	  Shape               Up
+	  Size                Normal
+	EndFont
+	LabelFont
+	  Family              Roman
+	  Shape               Italic
+	  Size                Normal
+	EndFont
+End
+