diff --git a/cstdlib/math.c b/cstdlib/math.c
index 252b33f..485835b 100644
--- a/cstdlib/math.c
+++ b/cstdlib/math.c
@@ -3,6 +3,21 @@
 
 #ifndef BUILTIN_MINI_STDLIB
 
+static double M_EValue =        2.7182818284590452354;   /* e */
+static double M_LOG2EValue =    1.4426950408889634074;   /* log_2 e */
+static double M_LOG10EValue =   0.43429448190325182765;  /* log_10 e */
+static double M_LN2Value =      0.69314718055994530942;  /* log_e 2 */
+static double M_LN10Value =     2.30258509299404568402;  /* log_e 10 */
+static double M_PIValue =       3.14159265358979323846;  /* pi */
+static double M_PI_2Value =     1.57079632679489661923;  /* pi/2 */
+static double M_PI_4Value =     0.78539816339744830962;  /* pi/4 */
+static double M_1_PIValue =     0.31830988618379067154;  /* 1/pi */
+static double M_2_PIValue =     0.63661977236758134308;  /* 2/pi */
+static double M_2_SQRTPIValue = 1.12837916709551257390;  /* 2/sqrt(pi) */
+static double M_SQRT2Value =    1.41421356237309504880;  /* sqrt(2) */
+static double M_SQRT1_2Value =  0.70710678118654752440;  /* 1/sqrt(2) */
+
+
 void MathSin(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
     ReturnValue->Val->FP = sin(Param[0]->Val->FP);
@@ -33,6 +48,11 @@ void MathAtan(struct ParseState *Parser, struct Value *ReturnValue, struct Value
     ReturnValue->Val->FP = atan(Param[0]->Val->FP);
 }
 
+void MathAtan2(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
+{
+    ReturnValue->Val->FP = atan2(Param[0]->Val->FP, Param[1]->Val->FP);
+}
+
 void MathSinh(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
     ReturnValue->Val->FP = sinh(Param[0]->Val->FP);
@@ -58,6 +78,21 @@ void MathFabs(struct ParseState *Parser, struct Value *ReturnValue, struct Value
     ReturnValue->Val->FP = fabs(Param[0]->Val->FP);
 }
 
+void MathFmod(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
+{
+    ReturnValue->Val->FP = fmod(Param[0]->Val->FP, Param[1]->Val->FP);
+}
+
+void MathFrexp(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
+{
+    ReturnValue->Val->FP = frexp(Param[0]->Val->FP, Param[1]->Val->NativePointer);
+}
+
+void MathLdexp(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
+{
+    ReturnValue->Val->FP = ldexp(Param[0]->Val->FP, Param[1]->Val->Integer);
+}
+
 void MathLog(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
     ReturnValue->Val->FP = log(Param[0]->Val->FP);
@@ -68,6 +103,11 @@ void MathLog10(struct ParseState *Parser, struct Value *ReturnValue, struct Valu
     ReturnValue->Val->FP = log10(Param[0]->Val->FP);
 }
 
+void MathModf(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
+{
+    ReturnValue->Val->FP = modf(Param[0]->Val->FP, Param[0]->Val->NativePointer);
+}
+
 void MathPow(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
     ReturnValue->Val->FP = pow(Param[0]->Val->FP, Param[1]->Val->FP);
@@ -80,7 +120,7 @@ void MathSqrt(struct ParseState *Parser, struct Value *ReturnValue, struct Value
 
 void MathRound(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
 {
-    ReturnValue->Val->FP = floor(Param[0]->Val->FP + 0.5);   /* XXX - fix for soft float */
+    ReturnValue->Val->FP = round(Param[0]->Val->FP );
 }
 
 void MathCeil(struct ParseState *Parser, struct Value *ReturnValue, struct Value **Param, int NumArgs)
@@ -96,43 +136,48 @@ void MathFloor(struct ParseState *Parser, struct Value *ReturnValue, struct Valu
 /* all math.h functions */
 struct LibraryFunction MathFunctions[] =
 {
-    { MathSin,          "float sin(float);" },
-    { MathCos,          "float cos(float);" },
-    { MathTan,          "float tan(float);" },
-    { MathAsin,         "float asin(float);" },
     { MathAcos,         "float acos(float);" },
+    { MathAsin,         "float asin(float);" },
     { MathAtan,         "float atan(float);" },
-    { MathSinh,         "float sinh(float);" },
+    { MathAtan2,        "float atan2(float, float);" },
+    { MathCeil,         "float ceil(float);" },
+    { MathCos,          "float cos(float);" },
     { MathCosh,         "float cosh(float);" },
-    { MathTanh,         "float tanh(float);" },
     { MathExp,          "float exp(float);" },
     { MathFabs,         "float fabs(float);" },
+    { MathFloor,        "float floor(float);" },
+    { MathFmod,         "float fmod(float, float);" },
+    { MathFrexp,        "float frexp(float, int *);" },
+    { MathLdexp,        "float ldexp(float, int);" },
     { MathLog,          "float log(float);" },
     { MathLog10,        "float log10(float);" },
+    { MathModf,         "float modf(float, float *);" },
     { MathPow,          "float pow(float,float);" },
-    { MathSqrt,         "float sqrt(float);" },
     { MathRound,        "float round(float);" },
-    { MathCeil,         "float ceil(float);" },
-    { MathFloor,        "float floor(float);" },
+    { MathSin,          "float sin(float);" },
+    { MathSinh,         "float sinh(float);" },
+    { MathSqrt,         "float sqrt(float);" },
+    { MathTan,          "float tan(float);" },
+    { MathTanh,         "float tanh(float);" },
     { NULL,             NULL }
 };
 
 /* creates various system-dependent definitions */
 void MathSetupFunc(void)
 {
-#if 0
-    VariableDefinePlatformVar(NULL, "EOF", &IntType, (union AnyValue *)&EOFValue, FALSE);
-    VariableDefinePlatformVar(NULL, "SEEK_SET", &IntType, (union AnyValue *)&SEEK_SETValue, FALSE);
-    VariableDefinePlatformVar(NULL, "SEEK_CUR", &IntType, (union AnyValue *)&SEEK_CURValue, FALSE);
-    VariableDefinePlatformVar(NULL, "SEEK_END", &IntType, (union AnyValue *)&SEEK_ENDValue, FALSE);
-    VariableDefinePlatformVar(NULL, "BUFSIZ", &IntType, (union AnyValue *)&BUFSIZValue, FALSE);
-    VariableDefinePlatformVar(NULL, "FILENAME_MAX", &IntType, (union AnyValue *)&FILENAME_MAXValue, FALSE);
-    VariableDefinePlatformVar(NULL, "_IOFBF", &IntType, (union AnyValue *)&_IOFBFValue, FALSE);
-    VariableDefinePlatformVar(NULL, "_IOLBF", &IntType, (union AnyValue *)&_IOLBFValue, FALSE);
-    VariableDefinePlatformVar(NULL, "_IONBF", &IntType, (union AnyValue *)&_IONBFValue, FALSE);
-    VariableDefinePlatformVar(NULL, "L_tmpnam", &IntType, (union AnyValue *)&L_tmpnamValue, FALSE);
-    VariableDefinePlatformVar(NULL, "GETS_MAX", &IntType, (union AnyValue *)&GETS_MAXValue, FALSE);
-#endif
+    VariableDefinePlatformVar(NULL, "M_E", &FPType, (union AnyValue *)&M_EValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_LOG2E", &FPType, (union AnyValue *)&M_LOG2EValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_LOG10E", &FPType, (union AnyValue *)&M_LOG10EValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_LN2", &FPType, (union AnyValue *)&M_LN2Value, FALSE);
+    VariableDefinePlatformVar(NULL, "M_LN10", &FPType, (union AnyValue *)&M_LN10Value, FALSE);
+    VariableDefinePlatformVar(NULL, "M_PI", &FPType, (union AnyValue *)&M_PIValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_PI_2", &FPType, (union AnyValue *)&M_PI_2Value, FALSE);
+    VariableDefinePlatformVar(NULL, "M_PI_4", &FPType, (union AnyValue *)&M_PI_4Value, FALSE);
+    VariableDefinePlatformVar(NULL, "M_1_PI", &FPType, (union AnyValue *)&M_1_PIValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_2_PI", &FPType, (union AnyValue *)&M_2_PIValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_2_SQRTPI", &FPType, (union AnyValue *)&M_2_SQRTPIValue, FALSE);
+    VariableDefinePlatformVar(NULL, "M_SQRT2", &FPType, (union AnyValue *)&M_SQRT2Value, FALSE);
+    VariableDefinePlatformVar(NULL, "M_SQRT1_2", &FPType, (union AnyValue *)&M_SQRT1_2Value, FALSE);
 }
 
 #endif /* !BUILTIN_MINI_STDLIB */