diff --git a/LICENSE.TERMS b/LICENSE
similarity index 100%
rename from LICENSE.TERMS
rename to LICENSE
diff --git a/Makefile.am b/Makefile.am
index 34716e4..f6ab98d 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = fcgi.pc \
                  fcgi++.pc
 
-EXTRA_DIST = LICENSE.TERMS              \
+EXTRA_DIST = LICENSE              \
              Makefile.nt                \
              cgi-fcgi/cgi-fcgi.mak      \
              examples/authorizer.mak    \
diff --git a/README.md b/README.md
index 7627db8..867c373 100755
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ FastCGI Developer's Kit
 -----------------------
 
 Copyright (c) 1996 Open Market, Inc.
-See the file "[LICENSE.TERMS](LICENSE.TERMS)" for information on usage and redistribution
+See the file "[LICENSE](LICENSE)" for information on usage and redistribution
 of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 Documentations
diff --git a/cgi-fcgi/cgi-fcgi.c b/cgi-fcgi/cgi-fcgi.c
index dd5146c..ea3025d 100644
--- a/cgi-fcgi/cgi-fcgi.c
+++ b/cgi-fcgi/cgi-fcgi.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/doc/FCGI_Accept.3 b/doc/FCGI_Accept.3
index 65ff08a..2e69e4e 100644
--- a/doc/FCGI_Accept.3
+++ b/doc/FCGI_Accept.3
@@ -123,6 +123,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_Accept.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $
diff --git a/doc/FCGI_Finish.3 b/doc/FCGI_Finish.3
index 9332253..533e73e 100644
--- a/doc/FCGI_Finish.3
+++ b/doc/FCGI_Finish.3
@@ -36,6 +36,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_Finish.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $
diff --git a/doc/FCGI_SetExitStatus.3 b/doc/FCGI_SetExitStatus.3
index d0538ff..6e65453 100644
--- a/doc/FCGI_SetExitStatus.3
+++ b/doc/FCGI_SetExitStatus.3
@@ -23,6 +23,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_SetExitStatus.3,v 1.1.1.1 1997/09/16 15:36:25 stanleyg Exp $
diff --git a/doc/FCGI_StartFilterData.3 b/doc/FCGI_StartFilterData.3
index 12ff2da..5866d2a 100644
--- a/doc/FCGI_StartFilterData.3
+++ b/doc/FCGI_StartFilterData.3
@@ -47,6 +47,6 @@ SEE ALSO
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: FCGI_StartFilterData.3,v 1.1.1.1 1997/09/16 15:36:26 stanleyg Exp $
diff --git a/doc/cgi-fcgi.1 b/doc/cgi-fcgi.1
index 1af4d0a..ea53fbf 100644
--- a/doc/cgi-fcgi.1
+++ b/doc/cgi-fcgi.1
@@ -108,6 +108,6 @@ BUGS
 
 HISTORY
      Copyright (c) 1996 Open Market, Inc.
-     See the file "LICENSE.TERMS" for information on usage and redistribution
+     See the file "LICENSE" for information on usage and redistribution
      of this file, and for a DISCLAIMER OF ALL WARRANTIES.
      $Id: cgi-fcgi.1,v 1.1.1.1 1997/09/16 15:36:26 stanleyg Exp $
diff --git a/doc/fastcgi-whitepaper/fastcgi.htm b/doc/fastcgi-whitepaper/fastcgi.htm
index 13b419b..fa8b7c7 100644
--- a/doc/fastcgi-whitepaper/fastcgi.htm
+++ b/doc/fastcgi-whitepaper/fastcgi.htm
@@ -13,7 +13,7 @@
 </STYLE>
    </HEAD>
    <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-   <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+   <!--See the file "LICENSE" for information on usage and redistribution-->
    <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
    <!-- $Id: fastcgi.htm,v 1.4 2002/02/25 00:45:06 robs Exp $ -->
    <BODY>
diff --git a/doc/fcgi-devel-kit.htm b/doc/fcgi-devel-kit.htm
index fbd8a9f..a7699bb 100644
--- a/doc/fcgi-devel-kit.htm
+++ b/doc/fcgi-devel-kit.htm
@@ -25,7 +25,7 @@ <H3 CLASS="c2">
          FastCGI Developer&#39;s Kit
       </H3>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <P CLASS="c1">
          Mark R. Brown<BR>
diff --git a/doc/fcgi-java.htm b/doc/fcgi-java.htm
index 32c6ac0..db58752 100644
--- a/doc/fcgi-java.htm
+++ b/doc/fcgi-java.htm
@@ -29,7 +29,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <!-- $Id: fcgi-java.htm,v 1.4 2002/02/25 00:42:59 robs Exp $ -->
       <P CLASS="c2">
diff --git a/doc/fcgi-perf.htm b/doc/fcgi-perf.htm
index 84e4ea0..fa86150 100644
--- a/doc/fcgi-perf.htm
+++ b/doc/fcgi-perf.htm
@@ -28,7 +28,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <DIV CLASS="c1">
          Mark R. Brown<BR>
diff --git a/doc/fcgi-perl.htm b/doc/fcgi-perl.htm
index b28c135..bbb4324 100644
--- a/doc/fcgi-perl.htm
+++ b/doc/fcgi-perl.htm
@@ -29,7 +29,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <H5 CLASS="c2">
          Copyright &copy; 1996 Open Market, Inc. 245 First Street, Cambridge, MA 02142 U.S.A.<BR>
diff --git a/doc/fcgi-spec.html b/doc/fcgi-spec.html
index cac9f9f..14bc3f6 100644
--- a/doc/fcgi-spec.html
+++ b/doc/fcgi-spec.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
 <HTML>
    <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-   <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+   <!--See the file "LICENSE" for information on usage and redistribution-->
    <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
    <HEAD>
       <TITLE>
diff --git a/doc/fcgi-tcl.htm b/doc/fcgi-tcl.htm
index 0d82c20..f146043 100644
--- a/doc/fcgi-tcl.htm
+++ b/doc/fcgi-tcl.htm
@@ -28,7 +28,7 @@ <H3>
          </H3>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <P CLASS="c2">
          Michael S. Shanzer<BR>
diff --git a/doc/overview.html b/doc/overview.html
index 4af5739..84f6de7 100644
--- a/doc/overview.html
+++ b/doc/overview.html
@@ -15,7 +15,7 @@ <H2>
          </H2>
       </DIV>
       <!--Copyright (c) 1996 Open Market, Inc.                                    -->
-      <!--See the file "LICENSE.TERMS" for information on usage and redistribution-->
+      <!--See the file "LICENSE" for information on usage and redistribution-->
       <!--of this file, and for a DISCLAIMER OF ALL WARRANTIES.                   -->
       <!-- $Id: overview.html,v 1.4 2002/02/25 00:42:59 robs Exp $ -->
       <UL>
diff --git a/examples/authorizer.c b/examples/authorizer.c
index 89f4fdb..d9759f3 100644
--- a/examples/authorizer.c
+++ b/examples/authorizer.c
@@ -4,7 +4,7 @@
  * FastCGI example Authorizer program using fcgi_stdio library
  *
  * Copyright (c) 1996 Open Market, Inc.
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: authorizer.c,v 1.1 2001/06/19 15:30:02 robs Exp $
diff --git a/examples/echo-x.c b/examples/echo-x.c
index 71e0d92..c900217 100644
--- a/examples/echo-x.c
+++ b/examples/echo-x.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/examples/echo.c b/examples/echo.c
index 0262473..4214f6a 100644
--- a/examples/echo.c
+++ b/examples/echo.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/examples/log-dump.c b/examples/log-dump.c
index a583980..ca09c58 100644
--- a/examples/log-dump.c
+++ b/examples/log-dump.c
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/include/fastcgi.h b/include/fastcgi.h
index d5b5468..6bc4ab2 100644
--- a/include/fastcgi.h
+++ b/include/fastcgi.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995-1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: fastcgi.h,v 1.1.1.1 1997/09/16 15:36:32 stanleyg Exp $
diff --git a/include/fcgi_stdio.h b/include/fcgi_stdio.h
index 6d242f3..7833b2b 100644
--- a/include/fcgi_stdio.h
+++ b/include/fcgi_stdio.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: fcgi_stdio.h,v 1.5 2001/06/22 13:21:15 robs Exp $
diff --git a/include/fcgiapp.h b/include/fcgiapp.h
index 8cadde1..a0ef673 100644
--- a/include/fcgiapp.h
+++ b/include/fcgiapp.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: fcgiapp.h,v 1.14 2003/06/22 00:16:44 robs Exp $
diff --git a/include/fcgimisc.h b/include/fcgimisc.h
index 0464455..5f7eac7 100644
--- a/include/fcgimisc.h
+++ b/include/fcgimisc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: fcgimisc.h,v 1.3 2001/06/18 14:25:47 robs Exp $
diff --git a/java/FCGIGlobalDefs.java b/java/FCGIGlobalDefs.java
index 04de745..97a70df 100644
--- a/java/FCGIGlobalDefs.java
+++ b/java/FCGIGlobalDefs.java
@@ -7,7 +7,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIGlobalDefs.java,v 1.3 2000/03/21 12:12:25 robs Exp $
diff --git a/java/FCGIInputStream.java b/java/FCGIInputStream.java
index fb505e6..f3e97e6 100644
--- a/java/FCGIInputStream.java
+++ b/java/FCGIInputStream.java
@@ -6,7 +6,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIInputStream.java,v 1.4 2000/03/21 12:12:25 robs Exp $
diff --git a/java/FCGIInterface.java b/java/FCGIInterface.java
index ce756d6..29917d5 100644
--- a/java/FCGIInterface.java
+++ b/java/FCGIInterface.java
@@ -7,7 +7,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIInterface.java,v 1.4 2000/03/27 15:37:25 robs Exp $
diff --git a/java/FCGIMessage.java b/java/FCGIMessage.java
index e39443d..2ea7251 100644
--- a/java/FCGIMessage.java
+++ b/java/FCGIMessage.java
@@ -7,7 +7,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIMessage.java,v 1.4 2000/10/02 15:09:07 robs Exp $
diff --git a/java/FCGIOutputStream.java b/java/FCGIOutputStream.java
index 503bda1..3b0f666 100644
--- a/java/FCGIOutputStream.java
+++ b/java/FCGIOutputStream.java
@@ -5,7 +5,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIOutputStream.java,v 1.3 2000/03/21 12:12:26 robs Exp $
diff --git a/java/FCGIRequest.java b/java/FCGIRequest.java
index d127397..7d25eef 100644
--- a/java/FCGIRequest.java
+++ b/java/FCGIRequest.java
@@ -5,7 +5,7 @@
  *
  *  Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * $Id: FCGIRequest.java,v 1.3 2000/03/21 12:12:26 robs Exp $
diff --git a/libfcgi/fcgi_stdio.c b/libfcgi/fcgi_stdio.c
index 93cdefc..dc46fe5 100644
--- a/libfcgi/fcgi_stdio.c
+++ b/libfcgi/fcgi_stdio.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/libfcgi/fcgiapp.c b/libfcgi/fcgiapp.c
index e978b7c..31f61c1 100644
--- a/libfcgi/fcgiapp.c
+++ b/libfcgi/fcgiapp.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1996 Open Market, Inc.
  *
- * See the file "LICENSE.TERMS" for information on usage and redistribution
+ * See the file "LICENSE" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  */
diff --git a/libfcgi/strerror.c b/libfcgi/strerror.c
index cc2e458..4924f64 100644
--- a/libfcgi/strerror.c
+++ b/libfcgi/strerror.c
@@ -1,5 +1,5 @@
 /*
- * The terms in the file "LICENSE.TERMS" do not apply to this file.
+ * The terms in the file "LICENSE" do not apply to this file.
  * See terms below.
  *
  * Copyright (c) 1988 Regents of the University of California.