diff --git a/Changes b/Changes
index 9ec8a07f7..70df8036e 100644
--- a/Changes
+++ b/Changes
@@ -372,4 +372,6 @@
 - Fixed a counting bug with unknown connections, very hopefully
 - Fixed /htm giving wrong response when /htm to 1
 - Fixed /shun showing "1970" to permanently shunned users
-- Fixed ./Config showing freebsd 3.0 in freebsd 4
\ No newline at end of file
+- Fixed ./Config showing freebsd 3.0 in freebsd 4
+- Made so badwords.*.conf accepts # comments
+- Added some default default badwords.message.conf and badwords.channel.conf
diff --git a/badwords.channel.conf b/badwords.channel.conf
new file mode 100644
index 000000000..9975a64e7
--- /dev/null
+++ b/badwords.channel.conf
@@ -0,0 +1,54 @@
+# 
+# Unreal Internet Relay Chat Daemon
+# Copyright (C) Carsten V. Munk 2000
+#
+# NOTE: Those words are not meant to insult you (the user)
+#       but is meant to be a list of words so that the +G channel/user mode 
+#       will work properly. You can easily modify this file at your will.
+#       If you got words to add to this file, please mail badwords@tspre.org
+#
+# 
+#
+#
+#
+# 
+#                This is some filling space, scroll down to see the words
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+#
+pussy
+fuck
+whore
+slut
+shit
+asshole
+bitch
+cunt
+vagina
+penis
+jackass
+*fucker*
+faggot
+fag
+horny
+gay
+dickhead
+sonuvabitch
+*fuck*
+ass
+boobs
+tits
diff --git a/badwords.message.conf b/badwords.message.conf
new file mode 100644
index 000000000..9975a64e7
--- /dev/null
+++ b/badwords.message.conf
@@ -0,0 +1,54 @@
+# 
+# Unreal Internet Relay Chat Daemon
+# Copyright (C) Carsten V. Munk 2000
+#
+# NOTE: Those words are not meant to insult you (the user)
+#       but is meant to be a list of words so that the +G channel/user mode 
+#       will work properly. You can easily modify this file at your will.
+#       If you got words to add to this file, please mail badwords@tspre.org
+#
+# 
+#
+#
+#
+# 
+#                This is some filling space, scroll down to see the words
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+# 
+#
+#
+#
+pussy
+fuck
+whore
+slut
+shit
+asshole
+bitch
+cunt
+vagina
+penis
+jackass
+*fucker*
+faggot
+fag
+horny
+gay
+dickhead
+sonuvabitch
+*fuck*
+ass
+boobs
+tits
diff --git a/src/badwords.c b/src/badwords.c
index 7b4027a5b..812678c6c 100644
--- a/src/badwords.c
+++ b/src/badwords.c
@@ -158,7 +158,8 @@ int  loadbadwords_channel(char *wordfile)
 			*ptr = '\0';
 		if (buf[0] == '\0')
 			continue;
-
+		if (buf[0] == '#')
+			continue;
 		for (j = 0, isregex = 0; j < strlen(buf); j++)
 		{
 			if ((int)buf[j] < 65 || (int)buf[j] > 123)
@@ -214,6 +215,8 @@ int  loadbadwords_message(char *wordfile)
 			*ptr = '\0';
 		if (buf[0] == '\0')
 			continue;
+		if (buf[0] == '#')
+			continue;
 
 		for (j = 0, isregex = 0; j < strlen(buf); j++)
 		{