diff --git a/Makefile.am b/Makefile.am
index 62ddfe99..a29d1a1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src conf doc web admin win32 examples tests
 
 EXTRA_DIST = README.md HACKING
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9d2db1d1..f4c0ed2a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,6 @@
 
 docdir = $(datadir)/doc/$(PACKAGE)
 
-docdir = $(datadir)/doc/icecast
 nobase_doc_DATA = index.html \
 	admin_interface/index.html \
 	auth/index.html \
diff --git a/src/Makefile.am b/src/Makefile.am
index a321345c..8612bcd0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,15 +84,45 @@ icecast_SOURCES = \
     auth_anonymous.c \
     auth_static.c
 
+if HAVE_CURL
+icecast_SOURCES += \
+    curl.c \
+    auth_url.c \
+    event_url.c
+endif
 
-EXTRA_icecast_SOURCES = curl.c yp.c \
-    auth_url.c event_url.c \
-    format_vorbis.c format_theora.c format_speex.c
+if ENABLE_YP
+icecast_SOURCES += yp.c
+endif
 
-icecast_DEPENDENCIES = @ICECAST_OPTIONAL@ common/net/libicenet.la common/thread/libicethread.la \
-    common/httpp/libicehttpp.la common/log/libicelog.la common/avl/libiceavl.la common/timing/libicetiming.la
-icecast_LDADD = $(icecast_DEPENDENCIES) @XIPH_LIBS@ @KATE_LIBS@
+if HAVE_OGG
+icecast_SOURCES += format_vorbis.c
+endif
 
-AM_CFLAGS = @XIPH_CFLAGS@
-AM_CPPFLAGS = -I$(srcdir)/common/ @XIPH_CPPFLAGS@
-AM_LDFLAGS = @XIPH_LDFLAGS@ @KATE_LIBS@
+if HAVE_THEORA
+icecast_SOURCES += format_theora.c
+endif
+
+if HAVE_SPEEX
+icecast_SOURCES += format_speex.c
+endif
+
+EXTRA_icecast_SOURCES = \
+    curl.c \
+    yp.c \
+    auth_url.c \
+    event_url.c \
+    format_vorbis.c \
+    format_theora.c \
+    format_speex.c
+
+icecast_DEPENDENCIES = \
+    common/net/libicenet.la \
+    common/thread/libicethread.la \
+    common/httpp/libicehttpp.la \
+    common/log/libicelog.la \
+    common/avl/libiceavl.la \
+    common/timing/libicetiming.la
+
+icecast_LDADD    = $(icecast_DEPENDENCIES)
+icecast_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/common
diff --git a/web/Makefile.am b/web/Makefile.am
index 1676058d..09edf3f5 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -1,9 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = assets
-
 webdir = $(pkgdatadir)/web
 web_DATA =      status.xsl \
                 favicon.ico \