diff -r f60f65507d8e Modules/_io/_iomodule.c
--- a/Modules/_io/_iomodule.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/_io/_iomodule.c	Thu Apr 23 13:26:52 2015 +0300
@@ -103,7 +103,7 @@ module _io
     encoding: str(nullable=True) = NULL
     errors: str(nullable=True) = NULL
     newline: str(nullable=True) = NULL
-    closefd: int(c_default="1") = True
+    closefd: boolint = True
     opener: object = None
 
 Open file and return a stream.  Raise IOError upon failure.
@@ -230,7 +230,7 @@ static PyObject *
 _io_open_impl(PyModuleDef *module, PyObject *file, const char *mode,
               int buffering, const char *encoding, const char *errors,
               const char *newline, int closefd, PyObject *opener)
-/*[clinic end generated code: output=7615d0d746eb14d2 input=0541ce15691a82f2]*/
+/*[clinic end generated code: output=7615d0d746eb14d2 input=85e66cfdeb227df9]*/
 {
     unsigned i;
 
diff -r f60f65507d8e Modules/_io/fileio.c
--- a/Modules/_io/fileio.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/_io/fileio.c	Thu Apr 23 13:26:52 2015 +0300
@@ -210,7 +210,7 @@ extern int _Py_open_cloexec_works;
 _io.FileIO.__init__
     file as nameobj: object
     mode: str = "r"
-    closefd: int(c_default="1") = True
+    closefd: boolint = True
     opener: object = None
 
 Open a file.
@@ -231,7 +231,7 @@ results in functionality similar to pass
 static int
 _io_FileIO___init___impl(fileio *self, PyObject *nameobj, const char *mode,
                          int closefd, PyObject *opener)
-/*[clinic end generated code: output=23413f68e6484bbd input=193164e293d6c097]*/
+/*[clinic end generated code: output=23413f68e6484bbd input=acc8e5585e47f711]*/
 {
     const char *name = NULL;
     PyObject *stringobj = NULL;
diff -r f60f65507d8e Modules/_io/textio.c
--- a/Modules/_io/textio.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/_io/textio.c	Thu Apr 23 13:26:52 2015 +0300
@@ -511,13 +511,13 @@ PyObject *
 /*[clinic input]
 _io.IncrementalNewlineDecoder.decode
     input: object
-    final: int(c_default="0") = False
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _io_IncrementalNewlineDecoder_decode_impl(nldecoder_object *self,
                                           PyObject *input, int final)
-/*[clinic end generated code: output=0d486755bb37a66e input=d65677385bfd6827]*/
+/*[clinic end generated code: output=0d486755bb37a66e input=f7593e0bfe3f05eb]*/
 {
     return _PyIncrementalNewlineDecoder_decode((PyObject *) self, input, final);
 }
@@ -792,8 +792,8 @@ static encodefuncentry encodefuncs[] = {
     encoding: str(nullable=True) = NULL
     errors: str(nullable=True) = NULL
     newline: str(nullable=True) = NULL
-    line_buffering: int(c_default="0") = False
-    write_through: int(c_default="0") = False
+    line_buffering: boolint = False
+    write_through: boolint = False
 
 Character and line based layer over a BufferedIOBase object, buffer.
 
@@ -830,7 +830,7 @@ static int
                                 const char *encoding, const char *errors,
                                 const char *newline, int line_buffering,
                                 int write_through)
-/*[clinic end generated code: output=56a83402ce2a8381 input=1f20decb8d54a4ec]*/
+/*[clinic end generated code: output=56a83402ce2a8381 input=85621a4b68a52d1e]*/
 {
     PyObject *raw, *codec_info = NULL;
     _PyIO_State *state = NULL;
diff -r f60f65507d8e Modules/binascii.c
--- a/Modules/binascii.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/binascii.c	Thu Apr 23 13:26:52 2015 +0300
@@ -1269,14 +1269,14 @@ static int table_hex[128] = {
 binascii.a2b_qp
 
     data: ascii_buffer
-    header: int(c_default="0") = False
+    header: boolint = False
 
 Decode a string of qp-encoded data.
 [clinic start generated code]*/
 
 static PyObject *
 binascii_a2b_qp_impl(PyModuleDef *module, Py_buffer *data, int header)
-/*[clinic end generated code: output=a44ef88270352114 input=5187a0d3d8e54f3b]*/
+/*[clinic end generated code: output=a44ef88270352114 input=7c5ffa7ea2785118]*/
 {
     Py_ssize_t in, out;
     char ch;
@@ -1369,9 +1369,9 @@ to_hex (unsigned char ch, unsigned char 
 binascii.b2a_qp
 
     data: Py_buffer
-    quotetabs: int(c_default="0") = False
-    istext: int(c_default="1") = True
-    header: int(c_default="0") = False
+    quotetabs: boolint = False
+    istext: boolint = True
+    header: boolint = False
 
 Encode a string using quoted-printable encoding.
 
@@ -1383,7 +1383,7 @@ are both encoded.  When quotetabs is set
 static PyObject *
 binascii_b2a_qp_impl(PyModuleDef *module, Py_buffer *data, int quotetabs,
                      int istext, int header)
-/*[clinic end generated code: output=a87ca9ccb94e2a9f input=7f2a9aaa008e92b2]*/
+/*[clinic end generated code: output=a87ca9ccb94e2a9f input=32ac7d9bd11261e5]*/
 {
     Py_ssize_t in, out;
     unsigned char *databuf, *odata;
diff -r f60f65507d8e Modules/cjkcodecs/clinic/multibytecodec.c.h
--- a/Modules/cjkcodecs/clinic/multibytecodec.c.h	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/cjkcodecs/clinic/multibytecodec.c.h	Thu Apr 23 13:26:52 2015 +0300
@@ -81,7 +81,7 @@ exit:
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalEncoder_encode__doc__,
-"encode($self, /, input, final=0)\n"
+"encode($self, /, input, final=False)\n"
 "--\n"
 "\n");
 
@@ -129,7 +129,7 @@ static PyObject *
 }
 
 PyDoc_STRVAR(_multibytecodec_MultibyteIncrementalDecoder_decode__doc__,
-"decode($self, /, input, final=0)\n"
+"decode($self, /, input, final=False)\n"
 "--\n"
 "\n");
 
@@ -321,4 +321,4 @@ PyDoc_STRVAR(_multibytecodec___create_co
 
 #define _MULTIBYTECODEC___CREATE_CODEC_METHODDEF    \
     {"__create_codec", (PyCFunction)_multibytecodec___create_codec, METH_O, _multibytecodec___create_codec__doc__},
-/*[clinic end generated code: output=0fe582cb941024c1 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b280b0c5d014b270 input=a9049054013a1b77]*/
diff -r f60f65507d8e Modules/cjkcodecs/multibytecodec.c
--- a/Modules/cjkcodecs/multibytecodec.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/cjkcodecs/multibytecodec.c	Thu Apr 23 13:26:52 2015 +0300
@@ -884,14 +884,14 @@ decoder_feed_buffer(MultibyteStatefulDec
 _multibytecodec.MultibyteIncrementalEncoder.encode
 
     input: object
-    final: int = 0
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalEncoder_encode_impl(MultibyteIncrementalEncoderObject *self,
                                                         PyObject *input,
                                                         int final)
-/*[clinic end generated code: output=123361b6c505e2c1 input=456b76d73e464661]*/
+/*[clinic end generated code: output=123361b6c505e2c1 input=05077368bbf2fb25]*/
 {
     return encoder_encode_stateful(STATEFUL_ECTX(self), input, final);
 }
@@ -1041,14 +1041,14 @@ static PyTypeObject MultibyteIncremental
 _multibytecodec.MultibyteIncrementalDecoder.decode
 
     input: Py_buffer
-    final: int = 0
+    final: boolint = False
 [clinic start generated code]*/
 
 static PyObject *
 _multibytecodec_MultibyteIncrementalDecoder_decode_impl(MultibyteIncrementalDecoderObject *self,
                                                         Py_buffer *input,
                                                         int final)
-/*[clinic end generated code: output=b9b9090e8a9ce2ba input=eb18c2f6e83589e1]*/
+/*[clinic end generated code: output=b9b9090e8a9ce2ba input=b54606b32ce917b1]*/
 {
     MultibyteDecodeBuffer buf;
     char *data, *wdata = NULL;
diff -r f60f65507d8e Modules/clinic/pyexpat.c.h
--- a/Modules/clinic/pyexpat.c.h	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/clinic/pyexpat.c.h	Thu Apr 23 13:26:52 2015 +0300
@@ -3,7 +3,7 @@ preserve
 [clinic start generated code]*/
 
 PyDoc_STRVAR(pyexpat_xmlparser_Parse__doc__,
-"Parse($self, data, isFinal=0, /)\n"
+"Parse($self, data, isFinal=False, /)\n"
 "--\n"
 "\n"
 "Parse XML data.\n"
@@ -291,4 +291,4 @@ exit:
 #ifndef PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
     #define PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF
 #endif /* !defined(PYEXPAT_XMLPARSER_USEFOREIGNDTD_METHODDEF) */
-/*[clinic end generated code: output=abdf05a21dae98c7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=4e46fa6bfd01b3a2 input=a9049054013a1b77]*/
diff -r f60f65507d8e Modules/pyexpat.c
--- a/Modules/pyexpat.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Modules/pyexpat.c	Thu Apr 23 13:26:52 2015 +0300
@@ -707,7 +707,7 @@ get_parse_result(xmlparseobject *self, i
 pyexpat.xmlparser.Parse
 
     data: object
-    isFinal: int = 0
+    isFinal: boolint = False
     /
 
 Parse XML data.
@@ -718,7 +718,7 @@ Parse XML data.
 static PyObject *
 pyexpat_xmlparser_Parse_impl(xmlparseobject *self, PyObject *data,
                              int isFinal)
-/*[clinic end generated code: output=37e105d55645b0f2 input=e37b81b8948ca7e0]*/
+/*[clinic end generated code: output=37e105d55645b0f2 input=5ca4991e1906b1e5]*/
 {
     const char *s;
     Py_ssize_t slen;
diff -r f60f65507d8e Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Objects/bytearrayobject.c	Thu Apr 23 13:26:52 2015 +0300
@@ -2776,7 +2776,7 @@ bytearray_join(PyByteArrayObject *self, 
 /*[clinic input]
 bytearray.splitlines
 
-    keepends: int(py_default="False") = 0
+    keepends: boolint = False
 
 Return a list of the lines in the bytearray, breaking at line boundaries.
 
@@ -2786,7 +2786,7 @@ true.
 
 static PyObject *
 bytearray_splitlines_impl(PyByteArrayObject *self, int keepends)
-/*[clinic end generated code: output=4223c94b895f6ad9 input=36f0b25bc792f6c0]*/
+/*[clinic end generated code: output=4223c94b895f6ad9 input=efb9dc3c3f1ded38]*/
 {
     return stringlib_splitlines(
         (PyObject*) self, PyByteArray_AS_STRING(self),
diff -r f60f65507d8e Objects/bytesobject.c
--- a/Objects/bytesobject.c	Thu Apr 23 11:36:40 2015 +0300
+++ b/Objects/bytesobject.c	Thu Apr 23 13:26:52 2015 +0300
@@ -2941,7 +2941,7 @@ bytes_decode_impl(PyBytesObject*self, co
 /*[clinic input]
 bytes.splitlines
 
-    keepends: int(py_default="False") = 0
+    keepends: boolint = False
 
 Return a list of the lines in the bytes, breaking at line boundaries.
 
@@ -2951,7 +2951,7 @@ true.
 
 static PyObject *
 bytes_splitlines_impl(PyBytesObject*self, int keepends)
-/*[clinic end generated code: output=995c3598f7833cad input=ddb93e3351080c8c]*/
+/*[clinic end generated code: output=995c3598f7833cad input=a47c5dd5417e45fc]*/
 {
     return stringlib_splitlines(
         (PyObject*) self, PyBytes_AS_STRING(self),
diff -r f60f65507d8e Tools/clinic/clinic.py
--- a/Tools/clinic/clinic.py	Thu Apr 23 11:36:40 2015 +0300
+++ b/Tools/clinic/clinic.py	Thu Apr 23 13:26:52 2015 +0300
@@ -2546,6 +2546,9 @@ class int_converter(CConverter):
         if type != None:
             self.type = type
 
+class boolint_converter(bool_converter):
+    format_unit = 'i'
+
 class unsigned_int_converter(CConverter):
     type = 'unsigned int'
     default_type = int