diff --git a/Objects/intobject.c b/Objects/intobject.c
index ba3dde1..a5dc134 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -721,10 +721,7 @@
 			a = 0;
 	}
 	else {
-		if (a < 0)
-			a = ~( ~(unsigned long)a >> b );
-		else
-			a = (unsigned long)a >> b;
+		a = Py_ARITHMETIC_RIGHT_SHIFT(long, a, b);
 	}
 	return PyInt_FromLong(a);
 }
diff --git a/Objects/longobject.c b/Objects/longobject.c
index a28dbaf..df3c6a5 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -571,7 +571,8 @@
 		int last = abs(a->ob_size);
 		int basebits = 1;
 		i = base;
-		while ((i >>= 1) > 1) ++basebits;
+		while ((i >>= 1) > 1)
+			++basebits;
 		
 		i = 0;
 		for (;;) {
@@ -853,7 +854,9 @@
 			carry += v->ob_digit[i+k] - z
 				+ ((twodigits)zz << SHIFT);
 			v->ob_digit[i+k] = carry & MASK;
-			carry = (carry >> SHIFT) - zz;
+			carry = Py_ARITHMETIC_RIGHT_SHIFT(BASE_TWODIGITS_TYPE,
+							  carry, SHIFT);
+			carry -= zz;
 		}
 		
 		if (i+k < size_v) {
@@ -870,7 +873,9 @@
 			for (i = 0; i < size_w && i+k < size_v; ++i) {
 				carry += v->ob_digit[i+k] + w->ob_digit[i];
 				v->ob_digit[i+k] = carry & MASK;
-				carry >>= SHIFT;
+				carry = Py_ARITHMETIC_RIGHT_SHIFT(
+						BASE_TWODIGITS_TYPE,
+						carry, SHIFT);
 			}
 		}
 	} /* for j, k */
@@ -988,8 +993,6 @@
 	for (i = 0; i < size_b; ++i) {
 		carry += a->ob_digit[i] + b->ob_digit[i];
 		z->ob_digit[i] = carry & MASK;
-		/* The following assumes unsigned shifts don't
-		   propagate the sign bit. */
 		carry >>= SHIFT;
 	}
 	for (; i < size_a; ++i) {