diff --git a/ChangeLog b/ChangeLog
index bcc03c7e8..079f59a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Wed Aug  9 1995   Gisle Aas <aas@oslonett.no>
+
+ o  Reorganisation as discussed on <libwww-perl@ics.uci.edu>
+       LWP::Date       --> HTTP::Date
+       LWP::MIMEheader --> HTTP::Headers
+       LWP::StatusCode --> HTTP::Status
+       LWP::Message    --> HTTP::Message
+       LWP::Request    --> HTTP::Request
+       LWP::Response   --> HTTP::Response
+       LWP::MIMEtypes  --> LWP::MediaTypes
+
+ o  HTTP::Date parses ctime format with missing timezone as suggested
+    by Roy Fielding <fielding@beach.w3.org>
+
+ o  HTTP::Status and LWP::MediaTypes exports their functions by default.
+
+ o  Splitted up the URI::URL module.  Schemes are implemented by separate
+    files that are autoloaded when used.  Self test moved to "t/uri.t".
+
+
+       
 Mon Aug  7 1995   Gisle Aas <aas@oslonett.no>
 
  o  Applied patch from Marc Hedlund <hedlund@best.com>
diff --git a/MANIFEST b/MANIFEST
index 9a06678dd..dae991f01 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -7,25 +7,25 @@ TODO				The To-Do list for the library
 VERSION				Program that determines the current version
 bin/mirror.PL			Writes bin/mirror script
 bin/request.PL			Writes bin/request script
+lib/HTTP/Date.pm		Date conversion routines
+lib/HTTP/Headers.pm		Class encapsulating HTTP Message headers
+lib/HTTP/Message.pm		Class encapsulating HTTP messages
+lib/HTTP/Request.pm		Class encapsulating HTTP Requests
+lib/HTTP/Response.pm		Class encapsulating HTTP Responses
+lib/HTTP/Status.pm		HTTP Status code processing
 lib/LWP.pm			Includes what you need
 lib/LWP/Base64.pm		Base 64 encoding/decoding routines
-lib/LWP/Date.pm			Date conversion routines
 lib/LWP/Debug.pm		Debugging support
-lib/LWP/MIMEheader.pm		Class encapsulating HTTP Message headers
-lib/LWP/MIMEtypes.pm		Library for MIME types
+lib/LWP/MediaTypes.pm		Library for MIME types
 lib/LWP/MemberMixin.pm		Helps you access %$self
-lib/LWP/Message.pm		Class encapsulating HTTP messages
 lib/LWP/Protocol.pm		Virtual base class for LWP protocols
 lib/LWP/Protocol/file.pm	Access local files
 lib/LWP/Protocol/ftp.pm		Access with the FTP protocol
 lib/LWP/Protocol/gopher.pm	Access with the Gopher protocol
 lib/LWP/Protocol/http.pm	Access with HTTP protocol
 lib/LWP/Protocol/mailto.pm	Allows you to POST mail using sendmail
-lib/LWP/Request.pm		Class encapsulating HTTP Requests
-lib/LWP/Response.pm		Class encapsulating HTTP Responses
 lib/LWP/Simple.pm		Procedural LWP interface
 lib/LWP/Socket.pm		TCP/IP socket interface
-lib/LWP/StatusCode.pm		HTTP Status code processing
 lib/LWP/UserAgent.pm		A WWW UserAgent class
 lib/URI/URL.pm			Class encapsulating URLs
 lib/URI/URL/file.pm		Implements file URLs
@@ -60,3 +60,4 @@ t/proxy.t
 t/receiveHeaders-http.pl
 t/sendHeaders-http.pl
 t/uri.t				Test URI::URL module
+upgrade_from_v02		Script that does most of the upgrade job
diff --git a/VERSION b/VERSION
index 87614e6b8..811e1beba 100755
--- a/VERSION
+++ b/VERSION
@@ -22,7 +22,7 @@ Andreas Koenig <koenig@mind.de>
 
 =cut
 
-$VERSION=0.02;
+$VERSION=0.06;
 
 use lib "lib";
 
@@ -76,8 +76,8 @@ sub rewrite
 }
 
 __END__
-LWP 0.02
+HTTP::Date 1.07
+LWP 0.03
 LWP::Base64 1.06
-LWP::Date 1.06
-LWP::Socket 1.05
-URI::URL 3.02
+LWP::Socket 1.06
+URI::URL 3.03