diff --git a/man/Makefile.am b/man/Makefile.am
index 151d6349..17d58fed 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1 +1,2 @@
 man_MANS = cwebp.1 dwebp.1
+EXTRA_DIST = $(man_MANS)
diff --git a/man/Makefile.in b/man/Makefile.in
index 84ca7080..fa089eea 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -188,6 +188,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man_MANS = cwebp.1 dwebp.1
+EXTRA_DIST = $(man_MANS)
 all: all-am
 
 .SUFFIXES:
diff --git a/src/Makefile.am b/src/Makefile.am
index 4012023f..c3db4bbd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = dec enc
 
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 lib_LTLIBRARIES = libwebp.la
 
 libwebp_la_SOURCES =
diff --git a/src/Makefile.in b/src/Makefile.in
index ebf8a5d1..616e6b83 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -247,7 +247,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = dec enc
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 lib_LTLIBRARIES = libwebp.la
 libwebp_la_SOURCES = 
 libwebp_la_LIBADD = dec/libwebpdecode.la \
diff --git a/src/dec/Makefile.am b/src/dec/Makefile.am
index ff30c023..b01b0d98 100644
--- a/src/dec/Makefile.am
+++ b/src/dec/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \
                           quant.c tree.c vp8.c webp.c yuv.c
diff --git a/src/dec/Makefile.in b/src/dec/Makefile.in
index 3d07b559..898133dd 100644
--- a/src/dec/Makefile.in
+++ b/src/dec/Makefile.in
@@ -211,7 +211,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 libwebpdecode_la_SOURCES = bits.h vp8i.h yuv.h bits.c dsp.c frame.c \
                           quant.c tree.c vp8.c webp.c yuv.c
 
@@ -263,7 +263,7 @@ clean-noinstLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwebpdecode.la: $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_DEPENDENCIES)
+libwebpdecode.la: $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_DEPENDENCIES) 
 	$(libwebpdecode_la_LINK)  $(libwebpdecode_la_OBJECTS) $(libwebpdecode_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
diff --git a/src/enc/Makefile.am b/src/enc/Makefile.am
index 740e0f09..76c0af35 100644
--- a/src/enc/Makefile.am
+++ b/src/enc/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \
                           config.c cost.c cost.h dsp.c filter.c \
diff --git a/src/enc/Makefile.in b/src/enc/Makefile.in
index aa777508..3f5fc11b 100644
--- a/src/enc/Makefile.in
+++ b/src/enc/Makefile.in
@@ -212,7 +212,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 libwebpencode_la_SOURCES = analysis.c bit_writer.c bit_writer.h \
                           config.c cost.c cost.h dsp.c filter.c \
                           frame.c iterator.c picture.c quant.c  \