diff --git a/.gitignore b/.gitignore
index d6ff91a9..8aa755ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,27 @@
 *~
 *.o
+*.lo
+*.la
+depcomp
+*.m4
+Makefile
+Makefile.in
+libtool
+missing
+autom4te.cache/
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+install-sh
+.deps/
+.libs
+lib/includes/spdylay/spdylayver.h
+lib/libspdylay.pc
+ltmain.sh
+stamp-h1
+.deps/
+INSTALL
diff --git a/Makefile.am b/Makefile.am
index ad8bb868..75014e2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,6 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-SUBDIRS = lib tests
+SUBDIRS = lib tests examples
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/README.rst b/README.rst
index e9c80c54..18c024f9 100644
--- a/README.rst
+++ b/README.rst
@@ -38,3 +38,16 @@ get a resource given in the command-line::
 Please note that OpenSSL with
 `NPN <http://technotes.googlecode.com/git/nextprotoneg.html>`_
 support is required in order to build and run ``spdycat``.
+
+==============
+Build from git
+==============
+
+Building from git is easy, but please be sure that at least autoconf 2.68 is
+used.
+
+autoreconf -i
+automake
+autoconf
+./configure
+make
diff --git a/configure.ac b/configure.ac
index c66aa8ce..fadf0c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ AC_CONFIG_HEADERS([config.h])
 
 dnl Checks for programs
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -86,6 +87,7 @@ AC_CONFIG_FILES([
   lib/includes/Makefile
   lib/includes/spdylay/spdylayver.h
   tests/Makefile
+  examples/Makefile
 ])
 AC_OUTPUT
 
diff --git a/examples/.gitignore b/examples/.gitignore
new file mode 100644
index 00000000..76f4335d
--- /dev/null
+++ b/examples/.gitignore
@@ -0,0 +1 @@
+spdycat
diff --git a/examples/Makefile b/examples/Makefile.am
similarity index 64%
rename from examples/Makefile
rename to examples/Makefile.am
index d81e0f5e..30db37b7 100644
--- a/examples/Makefile
+++ b/examples/Makefile.am
@@ -20,34 +20,12 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-CC = gcc
-CXX = g++
-CFLAGS = -Wall -g -O2 -I../lib/includes
-CXXFLAGS = $(CFLAGS)
-LDFLAGS = -L../lib/.libs
-LIBS = -lspdylay -lssl -lcrypto
 
-PROGRAMS = spdycat
-SPDYCAT_OBJS = spdycat.o spdylay_ssl.o util.o uri.o
+AM_CFLAGS = -Wall
+AM_CPPFLAGS = -I$(srcdir)/../lib/includes -I$(builddir)/../lib/includes `pkg-config --cflags libssl`
+AM_LDFLAGS = `pkg-config --libs libssl`
+LDADD = $(top_builddir)/lib/libspdylay.la
 
-.PHONY: all
-all: $(PROGRAMS)
+bin_PROGRAMS = spdycat
 
-util.o: util.cc util.h
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $<
-
-uri.o: uri.cc uri.h
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $<
-
-spdylay_ssl.o: spdylay_ssl.cc spdylay_ssl.h
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $<
-
-spdycat.o: spdycat.cc
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -c $<
-
-spdycat: $(SPDYCAT_OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(SPDYCAT_OBJS) -o $@ $(LIBS)
-
-.PHONY: clean
-clean:
-	rm -f *.o $(PROGRAMS)
+spdycat_SOURCES = uri.cc spdylay_ssl.cc util.cc spdycat.cc