diff --git a/Manifest.txt b/Manifest.txt
index 8da16c0..817e861 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -3,9 +3,8 @@ History.txt
 LICENSE
 Manifest.txt
 README.markdown
-README.textile
 Rakefile
-lib/net.rb
+lib/net-ldap.rb
 lib/net/ber.rb
 lib/net/ber/ber_parser.rb
 lib/net/ldap.rb
diff --git a/README.markdown b/README.markdown
index 0283e51..6ce5c94 100644
--- a/README.markdown
+++ b/README.markdown
@@ -48,18 +48,18 @@ unarchive and require 'lib/net'.
 
 Net::LDAP was originally developed by:
 
-* Francis Cianfrocca <garbagecat10@gmail.com>
+* Francis Cianfrocca <blackhedd@rubyforge.org>
 
 Contributions since:
 
-* Emiel van de Laar <gemiel@gmail.com>
+* Emiel van de Laar <emiel@rubyforge.org>
 * Rory O'Connell <rory.ocon@gmail.com>
-* Kaspar Schiess <kaspar.schiess@absurd.li>
-* Austin Ziegler <austin@rubyforge.com>
+* Kaspar Schiess <eule@rubyforge.org>
+* Austin Ziegler <austin@rubyforge.org>
 
 ## LICENSE
 
-Copyright (C) 2006 by Francis Cianfrocca
+Copyright (C) 2006 - 2010 by Francis Cianfrocca and other contributors.
 
 Please read the file LICENSE for licensing restrictions on this library. In
 the simplest terms, this library is available under the same terms as Ruby
diff --git a/lib/net/ber.rb b/lib/net/ber.rb
index 0b0ce03..d4f0ce7 100644
--- a/lib/net/ber.rb
+++ b/lib/net/ber.rb
@@ -26,6 +26,7 @@
 
 module Net
   module BER
+    VERSION = '0.1.0'
     
     #--
     # This condenses our nicely self-documenting ASN hashes down
@@ -91,4 +92,4 @@ module Net
   end
 end
 
-require 'net/ber/ber_parser'
\ No newline at end of file
+require 'net/ber/ber_parser'
diff --git a/lib/net/ber/ber_parser.rb b/lib/net/ber/ber_parser.rb
index 4351171..4846958 100644
--- a/lib/net/ber/ber_parser.rb
+++ b/lib/net/ber/ber_parser.rb
@@ -3,6 +3,8 @@ require 'stringio'
 module Net
   module BER
     module BERParser
+      VERSION = '0.1.0'
+
       # The order of these follows the class-codes in BER.
       # Maybe this should have been a hash.
       TagClasses = [:universal, :application, :context_specific, :private]
@@ -108,4 +110,3 @@ module Net
     end
   end
 end
-
diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index 241ed36..9cfb016 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -234,7 +234,7 @@ module Net
   class LDAP
     class LdapError < StandardError; end
 
-    VERSION = "0.5.0"
+    VERSION = "0.1.0"
 
     SearchScope_BaseObject = 0
     SearchScope_SingleLevel = 1
diff --git a/lib/net/ldap/dataset.rb b/lib/net/ldap/dataset.rb
index 2459b72..19c1490 100644
--- a/lib/net/ldap/dataset.rb
+++ b/lib/net/ldap/dataset.rb
@@ -1,6 +1,3 @@
-# $Id$
-#
-#
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
@@ -22,11 +19,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 #---------------------------------------------------------------------------
-#
-#
-
-
-
 
 module Net
   class LDAP
@@ -104,4 +96,4 @@ module Net
 
     end 
   end 
-end
\ No newline at end of file
+end
diff --git a/lib/net/ldap/entry.rb b/lib/net/ldap/entry.rb
index 65ebdb3..4282a38 100644
--- a/lib/net/ldap/entry.rb
+++ b/lib/net/ldap/entry.rb
@@ -1,8 +1,5 @@
-# $Id$
-#
 # LDAP Entry (search-result) support classes
 #
-#
 #----------------------------------------------------------------------------
 #
 # Copyright (C) 2006 by Francis Cianfrocca. All Rights Reserved.
@@ -261,5 +258,3 @@ class LDAP
 
 end # class LDAP
 end # module Net
-
-
diff --git a/lib/net/snmp.rb b/lib/net/snmp.rb
index 7678bb3..9184adc 100644
--- a/lib/net/snmp.rb
+++ b/lib/net/snmp.rb
@@ -29,6 +29,7 @@
 module Net
 
     class SNMP
+      VERSION = '0.1.0'
 
 	AsnSyntax = Net::BER.compile_syntax({
 	    :application => {