diff --git a/llvm/core.py b/llvm/core.py
index 2219aa7..5186c55 100644
--- a/llvm/core.py
+++ b/llvm/core.py
@@ -2014,6 +2014,40 @@ class Builder(object):
                                         ordering.lower(), int(bool(crossthread)))
         return _make_value(inst)
 
+    def atomic_xchg(self, *args, **kwargs):
+        return self.atomic_rmw('xchg', *args, **kwargs)
+
+    def atomic_add(self, *args, **kwargs):
+        return self.atomic_rmw('add', *args, **kwargs)
+
+    def atomic_sub(self, *args, **kwargs):
+        return self.atomic_rmw('sub', *args, **kwargs)
+
+    def atomic_and(self, *args, **kwargs):
+        return self.atomic_rmw('and', *args, **kwargs)
+
+    def atomic_nand(self, *args, **kwargs):
+        return self.atomic_rmw('nand', *args, **kwargs)
+
+    def atomic_or(self, *args, **kwargs):
+        return self.atomic_rmw('or', *args, **kwargs)
+
+    def atomic_xor(self, *args, **kwargs):
+        return self.atomic_rmw('xor', *args, **kwargs)
+
+    def atomic_max(self, *args, **kwargs):
+        return self.atomic_rmw('max', *args, **kwargs)
+
+    def atomic_min(self, *args, **kwargs):
+        return self.atomic_rmw('min', *args, **kwargs)
+
+    def atomic_umax(self, *args, **kwargs):
+        return self.atomic_rmw('umax', *args, **kwargs)
+
+    def atomic_umin(self, *args, **kwargs):
+        return self.atomic_rmw('umin', *args, **kwargs)
+
+
 #===----------------------------------------------------------------------===
 # Memory buffer
 #===----------------------------------------------------------------------===
diff --git a/test/atomic.py b/test/atomic.py
index 5e3d9b0..92be0e7 100644
--- a/test/atomic.py
+++ b/test/atomic.py
@@ -62,6 +62,7 @@ class TestAtomic(unittest.TestCase):
             inst = bldr.atomic_rmw('xchg', ptr, val, ordering)
             self.assertEqual(ordering, str(inst).split(' ')[-1])
 
+
         for op in test_these_atomic_op:
             inst = bldr.atomic_rmw(op, ptr, val, ordering)
             self.assertEqual(op, str(inst).strip().split(' ')[3])
@@ -70,5 +71,10 @@ class TestAtomic(unittest.TestCase):
         self.assertEqual('singlethread', str(inst).strip().split(' ')[-2])
 
 
+        for op in test_these_atomic_op:
+            atomic_op = getattr(bldr, 'atomic_%s' % op)
+            inst = atomic_op(ptr, val, ordering)
+            self.assertEqual(op, str(inst).strip().split(' ')[3])
+
 if __name__ == '__main__':
     unittest.main()