diff --git a/Makefile.am b/Makefile.am
index 882caf13..a8899ff2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,5 +4,4 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po src plugins data
 
-EXTRA_DIST = autogen.sh data
-
+EXTRA_DIST = autogen.sh Doxyfile readme.md
diff --git a/data/Makefile.am b/data/Makefile.am
index c1cf7932..7b124b87 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,3 +3,6 @@ SUBDIRS = pkgconfig man
 if DO_GTK
 SUBDIRS += icons misc
 endif
+
+EXTRA_DIST = \
+	hexchat.gresource.xml
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 06e52ad5..05eb59d5 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,3 +11,5 @@ install-data-hook:
 
 uninstall-hook:
 	$(UPDATE_ICON_CACHE);
+
+EXTRA_DIST = $(icon_DATA) $(hicolor_DATA)
diff --git a/data/misc/Makefile.am b/data/misc/Makefile.am
index 94138185..48805ba3 100644
--- a/data/misc/Makefile.am
+++ b/data/misc/Makefile.am
@@ -26,4 +26,6 @@ uninstall-hook:
 	$(UPDATE_MIME_DATABASE);
 	$(UPDATE_DESKTOP_DATABASE);
 
+EXTRA_DIST = hexchat.appdata.xml.in hexchat.desktop.in htm.desktop.in htm-mime.xml
+
 CLEANFILES = $(appdata_DATA) $(data_desktop_DATA)
diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am
index df541396..d8193a6e 100644
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = INSTALL LICENSE
+EXTRA_DIST = INSTALL LICENSE fish.h irc.h keystore.h plugin_hexchat.h
 
 libdir = $(hexchatlibdir)
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 75aa12bc..cdab7925 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST = \
 	inbound.h \
 	inet.h \
 	make-te.c \
+	marshalers.list \
 	modes.h \
 	network.h \
 	notify.h \
diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am
index 778b6cfb..79cc2f32 100644
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -7,15 +7,14 @@ bin_PROGRAMS = hexchat
 
 AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
 
-hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)
+hexchat_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(GUI_LIBS)
 
 EXTRA_DIST = \
 	ascii.h banlist.h chanlist.h chanview.h chanview-tabs.c \
 	chanview-tree.c custom-list.h editlist.h fe-gtk.h fkeys.h gtkutil.h joind.h \
 	maingui.h menu.h notifygui.h  notifications palette.h pixmaps.h plugin-notification.h \
-	plugin-tray.h plugingui.c plugingui.h rawlog.h sexy-iso-codes.h \
-	sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h \
-	../../data/hexchat.gresource.xml
+	plugin-tray.h plugingui.c plugingui.h rawlog.h servlistgui.h setup.h sexy-iso-codes.h \
+	sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h
 
 BUILT_SOURCES = resources.h resources.c
 
@@ -53,6 +52,8 @@ resources.h: $(top_srcdir)/data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RES
 resources.c: $(top_srcdir)/data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --manual-register $<
 
+EXTRA_DIST += $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data $(top_srcdir)/data/hexchat.gresource.xml)
+
 if DO_STATIC_ANALYSIS
 analyze_plists = $(hexchat_SOURCES:%.c=%.plist)
 all-local: $(analyze_plists)
diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am
index c4182803..0243e16f 100644
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = hexchat-text
 
 AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
 
-hexchat_text_LDADD = ../common/libhexchatcommon.a $(COMMON_LIBS)
+hexchat_text_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(COMMON_LIBS)
 hexchat_text_SOURCES = fe-text.c fe-text.h