diff --git a/lib/zig.h b/lib/zig.h
index 5d77c76c8f..6b95ba3358 100644
--- a/lib/zig.h
+++ b/lib/zig.h
@@ -1646,7 +1646,9 @@ static inline zig_u128 zig_wrap_u128(zig_u128 val, uint8_t bits) {
 }
 
 static inline zig_i128 zig_wrap_i128(zig_i128 val, uint8_t bits) {
-    return zig_make_i128(zig_wrap_i64(zig_hi_i128(val), bits - UINT8_C(64)), zig_lo_i128(val));
+    if (bits > UINT8_C(64)) return zig_make_i128(zig_wrap_i64(zig_hi_i128(val), bits - UINT8_C(64)), zig_lo_i128(val));
+    int64_t lo = zig_wrap_i64((int64_t)zig_lo_i128(val), bits);
+    return zig_make_i128(zig_shr_i64(lo, 63), (uint64_t)lo);
 }
 
 static inline zig_u128 zig_shlw_u128(zig_u128 lhs, uint8_t rhs, uint8_t bits) {
diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index 4d3e71e78a..b8606b1a17 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -4461,10 +4461,12 @@ fn airBitcast(f: *Function, inst: Air.Inst.Index) !CValue {
     if (dest_ty.isAbiInt()) {
         const dest_cty = try f.typeToCType(dest_ty, .complete);
         const dest_info = dest_ty.intInfo(target);
-        var wrap_ty_pl = Type.Payload.Bits{ .base = .{ .tag = switch (dest_info.signedness) {
+        var info_ty_pl = Type.Payload.Bits{ .base = .{ .tag = switch (dest_info.signedness) {
             .unsigned => .int_unsigned,
             .signed => .int_signed,
         } }, .data = dest_info.bits };
+        var wrap_cty: ?CType = null;
+        var need_bitcasts = false;
 
         try f.writeCValue(writer, local, .Other);
         if (dest_cty.castTag(.array)) |pl| {
@@ -4472,14 +4474,31 @@ fn airBitcast(f: *Function, inst: Air.Inst.Index) !CValue {
                 .Little => pl.data.len - 1,
                 .Big => 0,
             }});
-            wrap_ty_pl.data -= 1;
-            wrap_ty_pl.data %= @intCast(u16, f.byteSize(f.indexToCType(pl.data.elem_type)) * 8);
-            wrap_ty_pl.data += 1;
+            const elem_cty = f.indexToCType(pl.data.elem_type);
+            wrap_cty = elem_cty.toSignedness(dest_info.signedness);
+            need_bitcasts = wrap_cty.?.tag() == .zig_i128;
+            info_ty_pl.data -= 1;
+            info_ty_pl.data %= @intCast(u16, f.byteSize(elem_cty) * 8);
+            info_ty_pl.data += 1;
         }
-        const wrap_ty = Type.initPayload(&wrap_ty_pl.base);
-        try writer.writeAll(" = zig_wrap_");
-        try f.object.dg.renderTypeForBuiltinFnName(writer, wrap_ty);
+        try writer.writeAll(" = ");
+        if (need_bitcasts) {
+            try writer.writeAll("zig_bitcast_");
+            try f.object.dg.renderCTypeForBuiltinFnName(writer, wrap_cty.?.toUnsigned());
+            try writer.writeByte('(');
+        }
+        try writer.writeAll("zig_wrap_");
+        const info_ty = Type.initPayload(&info_ty_pl.base);
+        if (wrap_cty) |cty|
+            try f.object.dg.renderCTypeForBuiltinFnName(writer, cty)
+        else
+            try f.object.dg.renderTypeForBuiltinFnName(writer, info_ty);
         try writer.writeByte('(');
+        if (need_bitcasts) {
+            try writer.writeAll("zig_bitcast_");
+            try f.object.dg.renderCTypeForBuiltinFnName(writer, wrap_cty.?);
+            try writer.writeByte('(');
+        }
         try f.writeCValue(writer, local, .Other);
         if (dest_cty.castTag(.array)) |pl| {
             try writer.print("[{d}]", .{switch (target.cpu.arch.endian()) {
@@ -4487,7 +4506,9 @@ fn airBitcast(f: *Function, inst: Air.Inst.Index) !CValue {
                 .Big => 0,
             }});
         }
-        try f.object.dg.renderBuiltinInfo(writer, wrap_ty, .bits);
+        if (need_bitcasts) try writer.writeByte(')');
+        try f.object.dg.renderBuiltinInfo(writer, info_ty, .bits);
+        if (need_bitcasts) try writer.writeByte(')');
         try writer.writeAll(");\n");
     }
 
diff --git a/src/codegen/c/type.zig b/src/codegen/c/type.zig
index 85e4cc9840..313fcc130c 100644
--- a/src/codegen/c/type.zig
+++ b/src/codegen/c/type.zig
@@ -651,6 +651,13 @@ pub const CType = extern union {
         });
     }
 
+    pub fn toSignedness(self: CType, s: std.builtin.Signedness) CType {
+        return switch (s) {
+            .unsigned => self.toUnsigned(),
+            .signed => self.toSigned(),
+        };
+    }
+
     pub fn getStandardDefineAbbrev(self: CType) ?[]const u8 {
         return switch (self.tag()) {
             .char => "CHAR",