diff --git a/include/hash.h b/include/hash.h
index aa0ef79e..88bf7a54 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -82,7 +82,7 @@ extern void add_to_id_hash(const char *, struct Client *);
 extern void del_from_id_hash(const char *name, struct Client *client);
 extern struct Client *find_id(const char *name);
 
-extern struct Channel *get_or_create_channel(struct Client *client_p, const char *chname, int *isnew);
+extern struct Channel *get_or_create_channel(struct Client *client_p, const char *chname, bool *isnew);
 extern void del_from_channel_hash(const char *name, struct Channel *chan);
 extern struct Channel *find_channel(const char *name);
 
diff --git a/ircd/hash.c b/ircd/hash.c
index 0d3fb128..4341dbbd 100644
--- a/ircd/hash.c
+++ b/ircd/hash.c
@@ -405,7 +405,7 @@ find_channel(const char *name)
  *  block, if it didn't exist before).
  */
 struct Channel *
-get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
+get_or_create_channel(struct Client *client_p, const char *chname, bool *isnew)
 {
 	struct Channel *chptr;
 	int len;
@@ -434,12 +434,12 @@ get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
 	if (chptr != NULL)
 	{
 		if (isnew != NULL)
-			*isnew = 0;
+			*isnew = false;
 		return chptr;
 	}
 
 	if(isnew != NULL)
-		*isnew = 1;
+		*isnew = true;
 
 	chptr = allocate_channel(s);
 	chptr->channelts = rb_current_time();	/* doesn't hurt to set it here */
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 4018ff82..e83b564b 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -395,7 +395,7 @@ ms_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	static struct Mode mode;
 	time_t oldts;
 	time_t newts;
-	int isnew;
+	bool isnew;
 	bool keep_our_modes = true;
 	rb_dlink_node *ptr, *next_ptr;
 
@@ -512,7 +512,7 @@ ms_sjoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 	bool keep_our_modes = true;
 	bool keep_new_modes = true;
 	int fl;
-	int isnew;
+	bool isnew;
 	int mlen_uid;
 	int len_uid;
 	int len;