diff --git a/CHANGES b/CHANGES
index ce2c4388..7691ca33 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-27 Feb 2008 - 2.5.1-rc1
+03 Mar 2008 - 2.5.1-rc1
 -----------------------
 
+ * Cleaned up the "make test" target to better locate headers/libraries.
+
  * Now search /usr/lib64 and /usr/lib32 for lua libs.
 
  * No longer treat warnings as errors by default (use --enable-strict-compile).
diff --git a/apache2/Makefile.in b/apache2/Makefile.in
index 67274191..2da68979 100644
--- a/apache2/Makefile.in
+++ b/apache2/Makefile.in
@@ -112,7 +112,7 @@ mlogc-static:
 
 ### Experimental Test Framework (*NIX only right now)
 msc_test.lo: msc_test.c
-	$(LIBTOOL) --mode=compile $(CC) $(APXS_CFLAGS) $(EXTRA_CFLAGS) $(MODSEC_EXTRA_CFLAGS) $(CPPFLAGS) $(APR_CFLAGS) $(APU_CFLAGS) -o msc_test.lo -c msc_test.c
+	$(LIBTOOL) --mode=compile $(CC) $(APXS_INCLUDES) $(APXS_CFLAGS) $(EXTRA_CFLAGS) $(MODSEC_EXTRA_CFLAGS) $(CPPFLAGS) $(APR_CFLAGS) $(APU_CFLAGS) -o msc_test.lo -c msc_test.c
 
 msc_test: $(TESTOBJS) msc_test.lo
 	@objs=""; \
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index 52095796..2cb26fd8 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -4,7 +4,7 @@
   Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.5.1-rc1 (February 27, 2008)</releaseinfo>
+    <releaseinfo>Version 2.5.1-rc1 (March 03, 2008)</releaseinfo>
 
     <copyright>
       <year>2004-2008</year>
@@ -333,6 +333,11 @@
               <listitem>
                 <para>Optionally test with: <literal>make
                 test</literal></para>
+
+                <para>NOTE: This is step is still a bit experimental. If you
+                have problems, please send the full output and error from the
+                build to the support list. Most common issues are related to
+                not finding the required headers and/or libraries.</para>
               </listitem>
 
               <listitem>
@@ -6126,4 +6131,4 @@ Server: Apache/2.x.x
       </section>
     </section>
   </section>
-</article>
+</article>
\ No newline at end of file