diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..0038792
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,80 @@
+SUBDIRS = demangle . docs tests
+
+valdir = $(libdir)/valgrind
+
+LDFLAGS = -Wl,-z -Wl,initfirst
+
+INCLUDES += -I$(srcdir)/demangle
+
+bin_SCRIPTS = valgrind
+
+val_DATA = linux22.supp linux24.supp
+
+EXTRA_DIST = $(val_DATA) \
+	PATCHES_APPLIED ACKNOWLEDGEMENTS \
+	README_KDE3_FOLKS \
+	README_MISSING_SYSCALL_OR_IOCTL TODO
+
+val_PROGRAMS = valgrind.so valgrinq.so
+
+valgrinq_so_SOURCES = vg_valgrinq_dummy.c
+
+valgrind_so_SOURCES = \
+	vg_clientmalloc.c \
+	vg_clientperms.c \
+	vg_demangle.c \
+	vg_dispatch.S \
+	vg_errcontext.c \
+	vg_execontext.c \
+	vg_from_ucode.c \
+	vg_helpers.S \
+	vg_main.c \
+	vg_malloc2.c \
+	vg_memory.c \
+	vg_messages.c \
+	vg_mylibc.c \
+	vg_procselfmaps.c \
+	vg_profile.c \
+	vg_signals.c \
+	vg_startup.S \
+	vg_symtab2.c \
+	vg_syscall_mem.c \
+	vg_syscall.S \
+	vg_to_ucode.c \
+	vg_translate.c \
+	vg_transtab.c \
+	vg_valgrinq_dummy.c \
+	vg_vtagops.c
+
+valgrind_so_LDADD = \
+	demangle/cp-demangle.o \
+	demangle/cplus-dem.o \
+	demangle/dyn-string.o \
+	demangle/safe-ctype.o
+
+include_HEADERS = valgrind.h
+
+noinst_HEADERS = \
+        vg_kerneliface.h        \
+        vg_include.h            \
+        vg_version.h            \
+        vg_constants.h          \
+        vg_unsafe.h
+
+
+install-data-hook:
+	cd ${valdir} && rm -f default.supp && $(LN_S) $(DEFAULT_SUPP) default.supp
+
+vg_memory.o:
+	$(COMPILE) -O2 -mpreferred-stack-boundary=2 -c $<
+
+vg_clientmalloc.o:
+	$(COMPILE) -fno-omit-frame-pointer -c $<
+
+
+valgrind.so: $(valgrind_so_OBJECTS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o valgrind.so \
+	$(valgrind_so_OBJECTS) $(valgrind_so_LDADD)
+
+valgrinq.so: $(valgrinq_so_OBJECTS)
+	$(CC) $(CFLAGS) -shared -o valgrinq.so $(valgrinq_so_OBJECTS)