1 files changed, 9 insertions, 4 deletions
diff --git a/lib/rexml/encodings/UTF-16.rb b/lib/rexml/encodings/UTF-16.rb
index bd92fce18d..972169755e 100644
--- a/lib/rexml/encodings/UTF-16.rb
+++ b/lib/rexml/encodings/UTF-16.rb
@@ -1,7 +1,6 @@
 module REXML
   module Encoding
-    @@__REXML_encoding_methods =<<-EOL
-    def encode content
+    def encode_utf16 content
       array_utf8 = content.unpack("U*")
       array_enc = []
       array_utf8.each do |num|
@@ -16,7 +15,7 @@ module REXML
       array_enc.pack('C*')
     end
 
-    def decode(str)
+    def decode_utf16(str)
       array_enc=str.unpack('C*')
       array_utf8 = []
       2.step(array_enc.size-1, 2){|i| 
@@ -24,6 +23,12 @@ module REXML
       }
       array_utf8.pack('U*')
     end
-    EOL
+
+    register(UTF_16) do |obj|
+      class << obj
+        alias decode decode_utf16
+        alias encode encode_utf16
+      end
+    end
   end
 end