diff --git a/plugins/nonbmp/makefile.mak b/plugins/nonbmp/makefile.mak
deleted file mode 100644
index 1c28610d..00000000
--- a/plugins/nonbmp/makefile.mak
+++ /dev/null
@@ -1,18 +0,0 @@
-include "..\..\src\makeinc.mak"
-
-all: nonbmp.obj nonbmp.def
-	link $(LDFLAGS) $(LIBS) /dll /out:xcnonbmp.dll /def:nonbmp.def nonbmp.obj
-
-nonbmp.def:
-	echo EXPORTS > nonbmp.def
-	echo xchat_plugin_init >> nonbmp.def
-	echo xchat_plugin_deinit >> nonbmp.def
-
-nonbmp.obj: nonbmp.c makefile.mak
-	cl $(CFLAGS) $(GLIB) /I.. nonbmp.c
-
-clean:
-	del *.obj
-	del *.dll
-	del *.exp
-	del *.lib
diff --git a/plugins/nonbmp/nonbmp.c b/plugins/nonbmp/nonbmp.c
deleted file mode 100644
index 824c395e..00000000
--- a/plugins/nonbmp/nonbmp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <stdlib.h>
-#include <glib.h>
-#include <string.h>
-
-#include "xchat-plugin.h"
-
-static xchat_plugin *ph;
-static const char name[] = "Non-BMP";
-static const char desc[] = "Replace non-BMP characters with replacement characters";
-static const char version[] = "1.0000";
-static int recursing = 0;
-
-static int filter(
-	char *word[],
-	char *word_eol[],
-	void *unused
-) {
-	gunichar *line;
-	gchar *utf8_line;
-	glong length;
-	glong index;
-
-	if( recursing ) {
-		return XCHAT_EAT_NONE;
-	}
-
-	/* the input has already been checked so we can use the _fast version */
-	line = g_utf8_to_ucs4_fast(
-		(char *)word_eol[1],
-		-1, /* NUL terminated input */
-		&length
-	);
-	
-	for( index = 0; index < length; index++ ) {
-		if( line[ index ] > 0xFFFF ) {
-			line[ index ] = 0xFFFD; /* replacement character */
-		}
-	}
-
-	utf8_line = g_ucs4_to_utf8(
-		line,
-		-1, /* NUL terminated input */
-		NULL, /* items read */
-		NULL, /* items written */
-		NULL  /* ignore conversion error */
-	);
-
-	if( utf8_line == NULL ) {
-		/* conversion failed ... I guess we are screwed? */
-		g_free( line );
-		return XCHAT_EAT_NONE;
-	}
-
-	recursing = 1;
-	xchat_commandf( ph, "RECV %s", utf8_line );
-	recursing = 0;
-
-	g_free( line );
-	g_free( utf8_line );
-	return XCHAT_EAT_ALL;
-}
-
-int xchat_plugin_init(
-	xchat_plugin *plugin_handle,
-	char **plugin_name,
-	char **plugin_desc,
-	char **plugin_version,
-	char *arg 
-) {
-/*	int index = 0;*/
-
-	ph = plugin_handle;
-	*plugin_name = name;
-	*plugin_desc = desc;
-	*plugin_version = version;
-
-	xchat_hook_server( ph, "RAW LINE", XCHAT_PRI_HIGHEST, filter, (void *)NULL );
-	xchat_printf (ph, "%s plugin loaded\n", name);
-	return 1;
-}
-
-int
-xchat_plugin_deinit (void)
-{
-	xchat_printf (ph, "%s plugin unloaded\n", name);
-	return 1;
-}
\ No newline at end of file
diff --git a/win32/installer/hexchat-x64.skel.iss b/win32/installer/hexchat-x64.skel.iss
index 5d5a07d2..8bd8d7e7 100644
--- a/win32/installer/hexchat-x64.skel.iss
+++ b/win32/installer/hexchat-x64.skel.iss
@@ -43,7 +43,6 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning
-;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning
@@ -167,7 +166,6 @@ Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim
 Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo
 Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo
-;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp
 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp
diff --git a/win32/installer/hexchat-x86.skel.iss b/win32/installer/hexchat-x86.skel.iss
index 8c660c18..3857d8d5 100644
--- a/win32/installer/hexchat-x86.skel.iss
+++ b/win32/installer/hexchat-x86.skel.iss
@@ -42,7 +42,6 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning
-;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning
@@ -168,7 +167,6 @@ Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim
 Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo
 Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo
-;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp
 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp
diff --git a/win32/installer/hexchat-xp-x64.skel.iss b/win32/installer/hexchat-xp-x64.skel.iss
index 5d5a07d2..8bd8d7e7 100644
--- a/win32/installer/hexchat-xp-x64.skel.iss
+++ b/win32/installer/hexchat-xp-x64.skel.iss
@@ -43,7 +43,6 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning
-;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning
@@ -167,7 +166,6 @@ Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim
 Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo
 Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo
-;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp
 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp
diff --git a/win32/installer/hexchat-xp-x86.skel.iss b/win32/installer/hexchat-xp-x86.skel.iss
index 8c660c18..3857d8d5 100644
--- a/win32/installer/hexchat-xp-x86.skel.iss
+++ b/win32/installer/hexchat-xp-x86.skel.iss
@@ -42,7 +42,6 @@ Name: "plugins\exec"; Description: "Exec"; Types: custom; Flags: disablenouninst
 Name: "plugins\fishlim"; Description: "FiSHLiM"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\hextray"; Description: "HexTray"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\mpcinfo"; Description: "mpcInfo"; Types: custom; Flags: disablenouninstallwarning
-;Name: "plugins\nonbmp"; Description: "Non-BMP"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\sasl"; Description: "SASL"; Types: custom; Flags: disablenouninstallwarning
 Name: "plugins\upd"; Description: "Update Checker"; Types: normal custom; Flags: disablenouninstallwarning
 Name: "plugins\winamp"; Description: "Winamp"; Types: custom; Flags: disablenouninstallwarning
@@ -168,7 +167,6 @@ Source: "plugins\hcexec.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Co
 Source: "plugins\hcfishlim.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\fishlim
 Source: "etc\music.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\winamp or plugins\mpcinfo
 Source: "plugins\hcmpcinfo.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\mpcinfo
-;Source: "plugins\hcnonbmp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\nonbmp
 Source: "etc\download.png"; DestDir: "{app}\etc"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcupd.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\upd
 Source: "plugins\hcwinamp.dll"; DestDir: "{app}\plugins"; Flags: ignoreversion; Components: plugins\winamp