diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 9a358f09d..24f72d842 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -1,12 +1,39 @@
+#############################################################################
+#                                  _   _ ____  _     
+#  Project                     ___| | | |  _ \| |    
+#                             / __| | | | |_) | |    
+#                            | (__| |_| |  _ <| |___ 
+#                             \___|\___/|_| \_\_____|
+#
+# Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
+#
+# In order to be useful for every potential user, curl and libcurl are
+# dual-licensed under the MPL and the MIT/X-derivate licenses.
+#
+# You may opt to use, copy, modify, merge, publish, distribute and/or sell
+# copies of the Software, and permit persons to whom the Software is
+# furnished to do so, under the terms of the MPL or the MIT/X-derivate
+# licenses. You may pick one of these licenses.
+#
+# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+# KIND, either express or implied.
 #
 # $Id$
-#
+#############################################################################
 
 AUTOMAKE_OPTIONS = foreign nostdinc
 
-INCLUDES = -I$(top_srcdir)/include/curl -I$(top_builddir)/lib
+# $(top_srcdir)/include/curl is for the main curl include files, to make it
+# easier to include this specific set of curl headers, and NOT the ones
+# possibly already installed in the system.
+# -I$(top_srcdir)/lib is for the setup.h file, included by test.h
+# -I$(top_builddir)/lib is for the config.h file, possibly included by the
+# setup.h file
+INCLUDES = -I$(top_srcdir)/include/curl \
+           -I$(top_srcdir)/lib \
+           -I$(top_builddir)/lib
 
-LIBDIR = ../../lib
+LIBDIR = $(top_builddir)/lib
 
 SUPPORTFILES = first.c test.h