diff --git a/lib/net-ldap.rb b/lib/net-ldap.rb
index 8fa1559..879851e 100644
--- a/lib/net-ldap.rb
+++ b/lib/net-ldap.rb
@@ -1 +1,2 @@
+# -*- ruby encoding: utf-8 -*-
 require 'net/ldap'
diff --git a/lib/net/ber.rb b/lib/net/ber.rb
index b4cdad9..779c08b 100644
--- a/lib/net/ber.rb
+++ b/lib/net/ber.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 module Net # :nodoc:
   ##
   # == Basic Encoding Rules (BER) Support Module
diff --git a/lib/net/ber/ber_parser.rb b/lib/net/ber/ber_parser.rb
index fec2f67..682a599 100644
--- a/lib/net/ber/ber_parser.rb
+++ b/lib/net/ber/ber_parser.rb
@@ -1,6 +1,6 @@
+# -*- ruby encoding: utf-8 -*-
 require 'stringio'
 
-##
 # Implements Basic Encoding Rules parsing to be mixed into types as needed.
 module Net::BER::BERParser
   primitive = {
diff --git a/lib/net/ber/core_ext.rb b/lib/net/ber/core_ext.rb
index 6acc35f..b176df7 100644
--- a/lib/net/ber/core_ext.rb
+++ b/lib/net/ber/core_ext.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 require 'net/ber/ber_parser'
 # :stopdoc:
 class IO
diff --git a/lib/net/ber/core_ext/array.rb b/lib/net/ber/core_ext/array.rb
index fef386b..8fa12c1 100644
--- a/lib/net/ber/core_ext/array.rb
+++ b/lib/net/ber/core_ext/array.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # BER extensions to the Array class.
 module Net::BER::Extensions::Array
diff --git a/lib/net/ber/core_ext/bignum.rb b/lib/net/ber/core_ext/bignum.rb
index c2a0f03..dc62fb8 100644
--- a/lib/net/ber/core_ext/bignum.rb
+++ b/lib/net/ber/core_ext/bignum.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # BER extensions to the Bignum class.
 module Net::BER::Extensions::Bignum
diff --git a/lib/net/ber/core_ext/false_class.rb b/lib/net/ber/core_ext/false_class.rb
index 2de15dc..1df1eb6 100644
--- a/lib/net/ber/core_ext/false_class.rb
+++ b/lib/net/ber/core_ext/false_class.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # BER extensions to +false+.
 module Net::BER::Extensions::FalseClass
diff --git a/lib/net/ber/core_ext/fixnum.rb b/lib/net/ber/core_ext/fixnum.rb
index 7409ed1..221badd 100644
--- a/lib/net/ber/core_ext/fixnum.rb
+++ b/lib/net/ber/core_ext/fixnum.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # Ber extensions to the Fixnum class.
 module Net::BER::Extensions::Fixnum
diff --git a/lib/net/ber/core_ext/string.rb b/lib/net/ber/core_ext/string.rb
index 1835d9f..3a1b415 100644
--- a/lib/net/ber/core_ext/string.rb
+++ b/lib/net/ber/core_ext/string.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 require 'stringio'
 
 ##
diff --git a/lib/net/ber/core_ext/true_class.rb b/lib/net/ber/core_ext/true_class.rb
index 53975b1..ac66c92 100644
--- a/lib/net/ber/core_ext/true_class.rb
+++ b/lib/net/ber/core_ext/true_class.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # BER extensions to +true+.
 module Net::BER::Extensions::TrueClass
diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index ca7c8ce..c11ed15 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 require 'ostruct'
 
 module Net # :nodoc:
diff --git a/lib/net/ldap/dataset.rb b/lib/net/ldap/dataset.rb
index 8adcf30..363d259 100644
--- a/lib/net/ldap/dataset.rb
+++ b/lib/net/ldap/dataset.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # An LDAP Dataset. Used primarily as an intermediate format for converting
 # to and from LDIF strings and Net::LDAP::Entry objects.
diff --git a/lib/net/ldap/entry.rb b/lib/net/ldap/entry.rb
index 003d022..616ffe7 100644
--- a/lib/net/ldap/entry.rb
+++ b/lib/net/ldap/entry.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 ##
 # Objects of this class represent individual entries in an LDAP directory.
 # User code generally does not instantiate this class. Net::LDAP#search
diff --git a/lib/net/ldap/filter.rb b/lib/net/ldap/filter.rb
index d4776d3..1bd99ff 100644
--- a/lib/net/ldap/filter.rb
+++ b/lib/net/ldap/filter.rb
@@ -1,4 +1,5 @@
 # -*- ruby encoding: utf-8 -*-
+# -*- ruby encoding: utf-8 -*-
 
 ##
 # Class Net::LDAP::Filter is used to constrain LDAP searches. An object of
diff --git a/lib/net/ldap/password.rb b/lib/net/ldap/password.rb
index 8d8ba05..503c7fe 100644
--- a/lib/net/ldap/password.rb
+++ b/lib/net/ldap/password.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 require 'digest/sha1'
 require 'digest/md5'
 
diff --git a/lib/net/ldap/pdu.rb b/lib/net/ldap/pdu.rb
index 1db4411..bdde92c 100644
--- a/lib/net/ldap/pdu.rb
+++ b/lib/net/ldap/pdu.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 require 'ostruct'
 
 ##
diff --git a/lib/net/snmp.rb b/lib/net/snmp.rb
index afa9a7d..c19ab00 100644
--- a/lib/net/snmp.rb
+++ b/lib/net/snmp.rb
@@ -1,3 +1,4 @@
+# -*- ruby encoding: utf-8 -*-
 # :stopdoc:
 module Net
     class SNMP