diff --git a/plugins/Math.py b/plugins/Math.py
index e46ba1d0c..8af504e7a 100644
--- a/plugins/Math.py
+++ b/plugins/Math.py
@@ -130,6 +130,8 @@ class Math(callbacks.Privmsg):
             return math.sqrt(x)
     _mathEnv['sqrt'] = _sqrt
     _mathEnv['abs'] = abs
+    _mathEnv['max'] = max
+    _mathEnv['min'] = min
     _mathRe = re.compile(r'((?:(?<![A-Fa-f\d)])-)?'
                          r'(?:0x[A-Fa-f\d]+|'
                          r'0[0-7]+|'
diff --git a/test/test_Math.py b/test/test_Math.py
index 0afa70d4d..12d02d501 100644
--- a/test/test_Math.py
+++ b/test/test_Math.py
@@ -124,6 +124,10 @@ class MathTestCase(PluginTestCase, PluginDocumentation):
     def testCaseInsensitive(self):
         self.assertNotError('calc PI**PI')
 
+    def testCalcMaxMin(self):
+        self.assertResponse('calc max(1,2)', '2')
+        self.assertResponse('calc min(1,2)', '1')
+        
     def testICalc(self):
         self.assertResponse('icalc 1^1', '0')
         self.assertResponse('icalc 10**24', '1' + '0'*24)