diff --git a/pear-phpdoc b/pear-phpdoc
index 7450c18..5974ca2 100644
--- a/pear-phpdoc
+++ b/pear-phpdoc
@@ -1,38 +1,40 @@
 #!@PHP-BIN@
 <?php
-//
-// PhpDoc, a program for creating javadoc style documentation from php code
-// Copyright (C) 2000-2001 Joshua Eichorn
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-
-//
-// Copyright 2000-2001 Joshua Eichorn
-// Email jeichorn@phpdoc.org
-// Web 		http://phpdoc.org/
-// Mirror 	http://phpdocu.sourceforge.net/
-// Project	http://sourceforge.net/projects/phpdocu/
-//
-
-/** 
+/**
  * PHP auto documentor, like javadoc
  * If you get an error uses this as a shell script then its been dosified
- * @author Joshua Eichorn
- * @version 1.3.0
- * @copyright Joshua Eichorn
+ *
+ * phpDocumentor :: automatic documentation generator
+ *
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 2001-2006 Gregory Beaver
+ *
+ * LICENSE:
+ *
+ * This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation;
+ * either version 2.1 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category  ToolsAndUtilities
+ * @package   PhpDocumentor
+ * @author    Joshua Eichorn <jeichorn@phpdoc.org>
+ * @copyright 2000-2001 Joshua Eichorn
+ * @license   http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @filesource
+ * @link      http://www.phpdoc.org
+ * @link      http://pear.php.net/PhpDocumentor
  */
-include("PhpDocumentor/phpDocumentor/phpdoc.inc");
+require "PhpDocumentor/phpDocumentor/phpdoc.inc";
 ?>
diff --git a/phpdoc b/phpdoc
index 5671831..e8e092f 100755
--- a/phpdoc
+++ b/phpdoc
@@ -8,52 +8,53 @@ if [ "$?" -ne "0" ]; then
 	exit 1
 fi
 <?php
-//
-// PhpDoc, a program for creating javadoc style documentation from php code
-// Copyright (C) 2000-2001 Joshua Eichorn
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-
-//
-// Copyright 2000-2003 Joshua Eichorn
-// Email jeichorn@phpdoc.org
-// Web 		http://phpdoc.org/
-// Mirror 	http://phpdocu.sourceforge.net/
-// Project	http://sourceforge.net/projects/phpdocu/
-//
+/**
+ * PHP auto documentor, like javadoc
+ * If you get an error uses this as a shell script then its been dosified
+ *
+ * phpDocumentor :: automatic documentation generator
+ *
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 2001-2006 Gregory Beaver
+ *
+ * LICENSE:
+ *
+ * This library is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General
+ * Public License as published by the Free Software Foundation;
+ * either version 2.1 of the License, or (at your option) any
+ * later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category  ToolsAndUtilities
+ * @package   PhpDocumentor
+ * @author    Joshua Eichorn <jeichorn@phpdoc.org>
+ * @copyright 2000-2001 Joshua Eichorn
+ * @license   http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @filesource
+ * @link      http://www.phpdoc.org
+ * @link      http://pear.php.net/PhpDocumentor
+ */
 
 ob_end_clean(); // make output from autofind php code disapear
 
-/** 
- * PHP auto documentor, like javadoc
- * If you get an error uses this as a shell script then its been dosified...
- * fix it with "dos2unix" command.
- * @author Joshua Eichorn
- * @version 1.3.0
- * @copyright Joshua Eichorn
- */
 /**
  * utility: determine whether we're in PEAR or not
  */
-$test = @include("phpDocumentor/find_phpdoc.php");
-if ($test == 6) // find_phpdoc.php returns 6
-{
-    include("phpDocumentor/phpdoc.inc");
-} else
-{
+$test = @require "phpDocumentor/find_phpdoc.php";
+if ($test == 6) { 
+    // find_phpdoc.php returns 6
+    include "phpDocumentor/phpdoc.inc";
+} else {
     echo "Error: phpDocumentor not found\n";
 }
 ?>