diff --git a/Makefile b/Makefile
index 66a6fd02..0a6fac56 100755
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ nodocs: htdocs/always.php built-locale
 all: htdocs/always.php built-docs built-locale
 
 built-docs: docs/phpdoc.ini htdocs/*.php inc/*.php docs/translation.rst
-	apigen generate --quiet --title=DAViCal --todo --tree --deprecated -s inc -s htdocs -d docs/api || phpdoc -c docs/phpdoc.ini || echo "NOTICE: Failed to build API docs"
+	apigen generate --quiet --title=DAViCal --todo --tree --deprecated -s inc -s htdocs --exclude caldav-client.php -d docs/api || phpdoc -c docs/phpdoc.ini || echo "NOTICE: Failed to build API docs"
 	rst2pdf docs/translation.rst || echo "NOTICE: Failed to build ReST docs"
 	touch $@
 
diff --git a/inc/caldav-client-v2.php b/inc/caldav-client-v2.php
index d7dfaa48..d280eb09 100644
--- a/inc/caldav-client-v2.php
+++ b/inc/caldav-client-v2.php
@@ -4,7 +4,7 @@
 *
 * @package   awl
 *
-* @subpackage   caldav
+* @subpackage caldav-client-v2
 * @author Andrew McMillan <andrew@mcmillan.net.nz>
 * @copyright Andrew McMillan
 * @license   http://www.gnu.org/licenses/lgpl-3.0.txt  GNU LGPL version 3 or later
diff --git a/inc/caldav-client.php b/inc/caldav-client.php
index 71585f8c..4c1bf67f 100644
--- a/inc/caldav-client.php
+++ b/inc/caldav-client.php
@@ -1,12 +1,13 @@
 <?php
 /**
-* A Class for connecting to a caldav server
+* A Class for connecting to a caldav server (older, standalone version)
+* Use caldav-client-v2.php for a more powerful implementation.
 *
 * @package   awl
 * removed curl - now using fsockopen
 * changed 2009 by Andres Obrero - Switzerland andres@obrero.ch
 *
-* @subpackage   caldav
+* @subpackage caldav-client
 * @author Andrew McMillan <debian@mcmillan.net.nz>
 * @copyright Andrew McMillan
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2
@@ -15,8 +16,6 @@
 
 /**
 * A class for accessing DAViCal via CalDAV, as a client
-*
-* @package   awl
 */
 class CalDAVClient {
   /**