diff --git a/desmume/Makefile.am b/desmume/Makefile.am
index af437a64d..a631ea606 100644
--- a/desmume/Makefile.am
+++ b/desmume/Makefile.am
@@ -1 +1,2 @@
+EXTRA_DIST = README.LIN README.WIN
 SUBDIRS = src
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index e22603e97..094cc1e01 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,19 +1,20 @@
+EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc
 SUBDIRS = . $(UI_DIR)
 noinst_LIBRARIES = libdesmume.a
 libdesmume_a_SOURCES = \
         armcpu.c armcpu.h ARM9.h \
         arm_instructions.c arm_instructions.h \
-        bios.c bios.h cp15.c cp15.h \
-        cflash.c cflash.h fs.h \
+        bios.c bios.h bits.h cp15.c cp15.h \
+        cflash.c cflash.h config.h fs.h \
 	debug.c debug.h \
 	Disassembler.c Disassembler.h \
-	FIFO.c FIFO.h \
+	dscard.h fat.h FIFO.c FIFO.h \
 	GPU.c GPU.h \
-        mc.c mc.h \
+        mem.h mc.c mc.h \
 	wifi.c wifi.h \
         MMU.c MMU.h NDSSystem.c NDSSystem.h registers.h \
 	ROMReader.c ROMReader.h \
         saves.c saves.h \
         SPU.c SPU.h \
-        thumb_instructions.c thumb_instructions.h
+        thumb_instructions.c thumb_instructions.h types.h
 libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am
index f86952eda..d2391a178 100644
--- a/desmume/src/gtk-glade/Makefile.am
+++ b/desmume/src/gtk-glade/Makefile.am
@@ -1,9 +1,11 @@
+EXTRA_DIST = DeSmuME.dev
 bin_PROGRAMS = desmume-glade
 desmume_glade_SOURCES =  \
 	callbacks.c callbacks.h callbacks_IO.c callbacks_IO.h desmume.c desmume.h \
 	globals.h keyval_names.c main.c printscreen.c \
 	dTools/callbacks_1_ioregs.c dTools/callbacks_2_memview.c \
 	dTools/callbacks_3_palview.c dTools/callbacks_dtools.h \
+	dTools/dTools_display.h \
 	../sndsdl.h ../sndsdl.c ../ctrlssdl.h ../ctrlssdl.c 
 desmume_glade_LDADD = ../libdesmume.a $(SDL_LIBS) $(LIBGLADE_LIBS)
 desmume_glade_CFLAGS = $(SDL_CFLAGS) $(LIBGLADE_CFLAGS)
diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index beadc4674..907011083 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -1,9 +1,10 @@
+EXTRA_DIST = DeSmuME.xpm
 bin_PROGRAMS = desmume
 desmume_SOURCES = \
 	gtk-compat.c gtk-compat.h \
 	desmume.h desmume.c \
-	dToolsList.c \
-	tools/ioregsView.c \
+	dTool.h dToolsList.c \
+	tools/ioregsView.c tools/ioregsView.h \
 	globals.h \
 	../sndsdl.c \
 	../ctrlssdl.h ../ctrlssdl.c \