diff --git a/gi/overrides/Gst.py b/gi/overrides/Gst.py
index a3fc9d158aadcf23698ed12728f529662627aa6e..976bbf1557a7c0abca6810e21d406cca88cb1cb4 100644
--- a/gi/overrides/Gst.py
+++ b/gi/overrides/Gst.py
@@ -443,10 +443,10 @@ class Int64Range(Gst.Int64Range):
 
 class Bitmask(Gst.Bitmask):
     def __init__(self, v):
-        if not isinstance(v, int):
-            raise TypeError("%s is not an int." % (type(v)))
+        if not isinstance(v, long) and not isinstance(v, int):
+            raise TypeError("%s is not an int or long." % (type(v)))
 
-        self.v = v
+        self.v = long(v)
 
     def __str__(self):
         return hex(self.v)
diff --git a/testsuite/test_types.py b/testsuite/test_types.py
index 2a87cb9f35d0ceb718d9054e48e7316eb2180b23..5e2241f53bfb6f63456781e529dcd631abe24c61 100644
--- a/testsuite/test_types.py
+++ b/testsuite/test_types.py
@@ -396,4 +396,4 @@ class TestBitmask(TestCase):
         Gst.init(None)
 
         r = Gst.Bitmask(1 << 5)
-        self.assertEqual(str(r), '0x20')
+        self.assertEqual(str(r), '0x20L')