diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index 8f23294ecf..487cecde89 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-01  André Pönitz <poenitz@gmx.net>
+
+	* math_undersetinset.[Ch]: implement direct support for \underset
+
 2002-01-28  Martin Vermeer <martin.vermeer@hut.fi>
 
 	* math_support.C: removed the arrays latex_mathstyle[] and
@@ -74,7 +78,6 @@
 
 	* math_sizeinset.[Ch]: support for \displaystyle etc
 
-
 2001-12-18  Dekel Tsur  <dekelts@tau.ac.il>
 
 	* math_macrotable.C (builtinMacros): Adjust kern values.
diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index ff6bc1a6e5..b932fc2182 100644
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -125,5 +125,7 @@ libmathed_la_SOURCES = \
 	math_symbolinset.h \
 	math_unknowninset.C \
 	math_unknowninset.h \
+	math_undersetinset.C \
+	math_undersetinset.h \
 	math_xdata.C \
 	math_xdata.h
diff --git a/src/mathed/math_factory.C b/src/mathed/math_factory.C
index a032db44a4..be16ec7499 100644
--- a/src/mathed/math_factory.C
+++ b/src/mathed/math_factory.C
@@ -21,6 +21,7 @@
 #include "math_sqrtinset.h"
 #include "math_stackrelinset.h"
 #include "math_symbolinset.h"
+#include "math_undersetinset.h"
 #include "math_unknowninset.h"
 
 
@@ -41,6 +42,8 @@ MathAtom createMathInset(latexkeys const * l)
 		return MathAtom(new MathSymbolInset(l));
 	case LM_TK_STACK:
 		return MathAtom(new MathStackrelInset);
+	case LM_TK_UNDERSET:
+		return MathAtom(new MathUndersetInset);
 	case LM_TK_KERN: 
 		return MathAtom(new MathKernInset);
 	case LM_TK_BINOM:
diff --git a/src/mathed/math_hash.C b/src/mathed/math_hash.C
index d99375d32d..503a0ecbee 100644
--- a/src/mathed/math_hash.C
+++ b/src/mathed/math_hash.C
@@ -138,6 +138,7 @@ key_type wordlist_array[] =
 	{"underbar",  LM_TK_DECORATION, 0},
 	{"underbrace",  LM_TK_DECORATION, 0},
 	{"underline",  LM_TK_DECORATION, 0},
+	{"underset",  LM_TK_UNDERSET, 0},
 	{"vdots",  LM_TK_DOTS, 0},
 	{"vec",  LM_TK_DECORATION, 0},
 	{"widehat",  LM_TK_DECORATION, 0},
diff --git a/src/mathed/math_parser.h b/src/mathed/math_parser.h
index d641de67f4..05a936af89 100644
--- a/src/mathed/math_parser.h
+++ b/src/mathed/math_parser.h
@@ -110,6 +110,8 @@ enum MathTokenEnum
 	///
 	LM_TK_KERN,
 	///
+	LM_TK_UNDERSET,
+	///
 	LM_TK_STACK
 };
 
diff --git a/src/mathed/math_undersetinset.C b/src/mathed/math_undersetinset.C
new file mode 100644
index 0000000000..5e42606b42
--- /dev/null
+++ b/src/mathed/math_undersetinset.C
@@ -0,0 +1,50 @@
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "math_undersetinset.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
+
+
+MathUndersetInset::MathUndersetInset()
+{}
+
+
+MathInset * MathUndersetInset::clone() const
+{   
+	return new MathUndersetInset(*this);
+}
+
+
+void MathUndersetInset::metrics(MathMetricsInfo const & mi) const
+{
+	MathMetricsInfo m = mi;
+	smallerStyleFrac(m);
+	xcell(0).metrics(m);
+	xcell(1).metrics(mi);
+	width_   = std::max(xcell(0).width(), xcell(1).width()) + 4; 
+	ascent_  = xcell(1).ascent();
+	descent_ = xcell(1).descent() + xcell(0).height() + 4;
+}
+
+
+void MathUndersetInset::draw(Painter & pain, int x, int y) const
+{
+	int m  = x + width() / 2;
+	int yo = y + xcell(1).descent() + xcell(0).ascent() + 1;
+	xcell(0).draw(pain, m - xcell(0).width() / 2, yo);
+	xcell(1).draw(pain, m - xcell(1).width() / 2, y);
+}
+
+
+void MathUndersetInset::write(WriteStream & os) const
+{
+	os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
+}
+
+
+void MathUndersetInset::normalize(NormalStream & os) const
+{
+	os << "[underset " << cell(0) << ' ' << cell(1) << ']';
+}
diff --git a/src/mathed/math_undersetinset.h b/src/mathed/math_undersetinset.h
new file mode 100644
index 0000000000..bfb66fe126
--- /dev/null
+++ b/src/mathed/math_undersetinset.h
@@ -0,0 +1,31 @@
+// -*- C++ -*-
+#ifndef MATH_UNDERSETINSET_H
+#define MATH_UNDERSETINSET_H
+
+#include "math_fracbase.h"
+
+#ifdef __GNUG__
+#pragma interface
+#endif
+
+/** Underset objects 
+    \author André Pönitz
+ */
+class MathUndersetInset : public MathFracbaseInset {
+public:
+	///
+	MathUndersetInset();
+	///
+	MathInset * clone() const;
+	///
+	void metrics(MathMetricsInfo const & st) const;
+	///
+	void draw(Painter &, int x, int y) const;
+
+	///
+	void write(WriteStream & os) const;
+	///
+	void normalize(NormalStream &) const;
+};
+
+#endif