diff --git a/Makefile.am b/Makefile.am
index ce7cd64..3d741c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,8 @@ pkginclude_HEADERS = \
                      include/libcouchbase/timings.h \
                      include/libcouchbase/types.h \
                      include/libcouchbase/visibility.h \
-                     include/libcouchbase/winsock_io_opts.h
+                     include/libcouchbase/winsock_io_opts.h \
+                     include/libcouchbase/doc.h

 libcouchbase_la_SOURCES = \
                         src/arithmetic.c \
@@ -72,9 +73,9 @@ if !HAVE_GETHRTIME
 libcouchbase_la_SOURCES += src/gethrtime.c
 endif

-#if HAVE_LIBEVENT2
-#libcouchbase_la_SOURCES += src/views.c
-#endif
+if HAVE_LIBEVENT2
+libcouchbase_la_SOURCES += src/views.c
+endif

 # Please remember to update the version info before each release if you
 # add / remove functions.
@@ -169,6 +170,7 @@ tests_flags_test_LDFLAGS = -levent
 tests_flags_test_CPPFLAGS=$(AM_CPPFLAGS) $(CPPFLAGS) -Itests

 tools_cbc_LDADD = libcouchbase.la
+tools_cbc_LDFLAGS = -levent
 tools_cbc_SOURCES = tools/cbc.cc tools/commandlineparser.cc             \
                     tools/commandlineparser.h tools/configuration.cc    \
                     tools/configuration.h
@@ -177,6 +179,7 @@ TESTS=${check_PROGRAMS}

 example_pillowfight_SOURCES = tools/commandlineparser.cc example/pillowfight.cc
 example_pillowfight_LDADD = libcouchbase.la
+example_pillowfight_LDFLAGS = -levent

 CBC_LINKS=cbc-cat cbc-rm cbc-cp cbc-stat cbc-flush cbc-create cbc-version
 install-exec-hook: