diff --git a/src/ChangeLog b/src/ChangeLog
index 1d231eb77d..7eb5de690d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,15 +1,19 @@
+2005-06-11  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+	* LaTeXFeatures.C (getPackages): solve amsmath-wasysym conflict
+
 2005-06-09  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
-	* rowpainter.C (paintInset, paintHebrewComposeChar) 
+	* rowpainter.C (paintInset, paintHebrewComposeChar)
 	(paintArabicComposeChar, paintChars): add a LyXFont argument.
 	(paintChars): use getFontSpan to reduce calls to getFont to a
 	minimum; use Paragraph::lookupChange instead of isXXXText.
 	(paintForeignMark): rename LyXFont argument.
 	(paintFromPos): pass a LyXFont object to the various paintXXX
-	methods. 
+	methods.
 
 	* FontIterator.C (FontIterator, operator++): use
-	Paragraph::getFontSpan 
+	Paragraph::getFontSpan
 
 	* paragraph.C (getFontSpan): replace getEndOfFontSpan with a
 	version that returns the font span as a pair.
diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 144f98a289..4bf391479c 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -238,7 +238,6 @@ char const * simplefeatures[] = {
 	"varioref",
 	"prettyref",
 	"float",
-	"wasysym",
 	"dvipost",
 	"fancybox",
 	"calc",
@@ -275,6 +274,11 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage{amsmath}\n";
 	}
 
+	// wasysym is a simple feature, but it must be after amsmath if both
+	// are used
+	if (isRequired("wasysym"))
+		packages << "\\usepackage{wasysym}\n";
+
 	// color.sty
 	if (isRequired("color")) {
 		if (params_.graphicsDriver == "default")