diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 289c3fca..830d73eb 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libxchatcommon.a
+noinst_LIBRARIES = libhexchatcommon.a
 
 AM_CPPFLAGS = $(COMMON_CFLAGS)
 
@@ -47,16 +47,16 @@ endif
 
 if USE_DBUS
 dbusdir = dbus
-libxchatcommon_a_LIBADD =				\
+libhexchatcommon_a_LIBADD =				\
 	$(top_builddir)/src/common/dbus/dbus-*.$(OBJEXT)
 endif
 SUBDIRS = $(dbusdir) .
 
-libxchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \
+libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \
 	inbound.c modes.c msproxy.c network.c notify.c outbound.c \
 	plugin.c plugin-timer.c proto-irc.c server.c servlist.c $(ssl_c) \
 	strlutil.c text.c tree.c url.c userlist.c util.c xchat.c
-libxchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
+libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
 
 textevents: make-te
 	./make-te < textevents.in > textevents.h 2> textenums.h
diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am
index 0136ca84..3928b413 100644
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = hexchat
 
 AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
 
-hexchat_LDADD = ../common/libxchatcommon.a $(GUI_LIBS)
+hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)
 
 EXTRA_DIST = \
 	about.h ascii.h banlist.h chanlist.h chanview.h chanview-tabs.c \
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index fd0415ba..cbc721db 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -6,6 +6,6 @@ EXTRA_DIST = README
 
 AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
 
-hexchat_text_LDADD = ../common/libxchatcommon.a $(COMMON_LIBS)
+hexchat_text_LDADD = ../common/libhexchatcommon.a $(COMMON_LIBS)
 hexchat_text_SOURCES = fe-text.c fe-text.h