diff --git a/.gitignore b/.gitignore
index 8ff6499d3..326fac8fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,14 +3,22 @@ autom4te.cache
 aclocal.m4
 depcomp
 INSTALL
+Makefile
 Makefile.in
-config.h.in
 config.guess
+config.h
+config.h.in
+config.log
+config.status
 config.sub
 configure
 install-sh
+libtool
 ltmain.sh
 missing
+stamp-h1
+check/.deps
+lib/.deps
 m4/libtool.m4
 m4/lt~obsolete.m4
 m4/ltoptions.m4
@@ -18,5 +26,3 @@ m4/ltsugar.m4
 m4/ltversion.m4
 doc/mdate-sh
 doc/texinfo.tex
-lightning/Makefile.in
-tests/Makefile.in
diff --git a/ChangeLog b/ChangeLog
index 71653dc90..e914f3b89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-02 Paulo Andrade <pcpa@gnu.org>
+
+	* .gitignore: Update pattern of ignored files.
+
+	* check/Makefile.am: Add rule to build liblightning.la dependency
+	in case of running "make check" before building the library.
+
 2012-12-02 Paulo Andrade <pcpa@gnu.org>
 
 	* lightning/Makefile.am, lightning/asm-common.h,
diff --git a/check/Makefile.am b/check/Makefile.am
index 0c37dcf97..6d9d1e064 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -16,7 +16,10 @@ AM_CFLAGS = -I$(top_srcdir)/include -D_GNU_SOURCE
 
 check_PROGRAMS = lightning
 
-lightning_LDADD = $(top_srcdir)/lib/liblightning.la -ldl
+lightning_LDADD = $(top_builddir)/lib/liblightning.la -ldl
+
+$(top_builddir)/lib/liblightning.la:
+	cd $(top_builddir)/lib; $(MAKE) $(AM_MAKEFLAGS) liblightning.la
 
 lightning_SOURCES =			\
 	lightning.c