diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 00000000..372cdb81
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,13 @@
+SUBDIRS = . images
+
+EXTRA_DIST = comparison.html \
+	developers.html \
+	documentation.html \
+	download.html \
+	features.html \
+	format.html \
+	goals.html \
+	id.html \
+	index.html \
+	news.html
+
diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am
new file mode 100644
index 00000000..4d523268
--- /dev/null
+++ b/doc/images/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = 1x1.gif \
+	cafebug.gif \
+	logo.jpg
diff --git a/include/FLAC/Makefile.am b/include/FLAC/Makefile.am
new file mode 100644
index 00000000..89c5b677
--- /dev/null
+++ b/include/FLAC/Makefile.am
@@ -0,0 +1,9 @@
+includedir = ${prefix}/include/FLAC
+
+include_HEADERS = all.h \
+	encoder.h \
+	file_decoder.h \
+	format.h \
+	ordinals.h \
+	seek_table.h \
+	stream_decoder.h
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 00000000..c16e944d
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = FLAC
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 00000000..5ecbf6a0
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,6 @@
+flac.1: flac.sgml
+	docbook-to-man $< > $@
+
+man_MANS = flac.1
+
+EXTRA_DIST = $(man_MANS) flac.sgml
diff --git a/src/libFLAC/include/Makefile.am b/src/libFLAC/include/Makefile.am
new file mode 100644
index 00000000..64948e4c
--- /dev/null
+++ b/src/libFLAC/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = private protected
diff --git a/src/libFLAC/include/private/Makefile.am b/src/libFLAC/include/private/Makefile.am
new file mode 100644
index 00000000..0a04d1d5
--- /dev/null
+++ b/src/libFLAC/include/private/Makefile.am
@@ -0,0 +1,10 @@
+noinst_HEADERS = bitbuffer.h \
+	all.h \
+	bitmath.h \
+	cpu.h \
+	crc.h \
+	encoder_framing.h \
+	fixed.h \
+	lpc.h \
+	md5.h \
+	memory.h
diff --git a/src/libFLAC/include/protected/Makefile.am b/src/libFLAC/include/protected/Makefile.am
new file mode 100644
index 00000000..09f8c73d
--- /dev/null
+++ b/src/libFLAC/include/protected/Makefile.am
@@ -0,0 +1 @@
+noinst_HEADERS = stream_decoder.h
diff --git a/src/plugin_winamp2/Makefile.am b/src/plugin_winamp2/Makefile.am
new file mode 100644
index 00000000..8b5cf357
--- /dev/null
+++ b/src/plugin_winamp2/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST = Makefile.vc \
+	in2.h \
+	in_flac.c \
+	out.h
diff --git a/src/plugin_winamp3/Makefile.am b/src/plugin_winamp3/Makefile.am
new file mode 100644
index 00000000..b4df0d97
--- /dev/null
+++ b/src/plugin_winamp3/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = Makefile.vc \
+	core_api.h \
+	in_flac.cpp