diff --git a/setup.py b/setup.py
index a611dd46..94790290 100755
--- a/setup.py
+++ b/setup.py
@@ -85,6 +85,7 @@ setup(name='Terminator',
                   ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
                  ],
       py_modules=['terminatorconfig'],
+      py_modules=['terminatorencoding'],
       cmdclass={'build': BuildData, 'install_data': InstallData}
      )
 
diff --git a/terminator b/terminator
index c1b9579e..dc2528fb 100755
--- a/terminator
+++ b/terminator
@@ -38,6 +38,9 @@ import pwd
 # import our configuration loader
 import terminatorconfig
 
+#import encoding list
+from terminatorencoding import TerminatorEncoding
+
 # import gtk libs
 # check just in case anyone runs it on a non-gnome system.
 try:
@@ -72,89 +75,7 @@ def openurl (url):
   except:
     pass
 
-class Encoding:
-  
-  encodings = [
-    [True, None, _("Current Locale")],
-    [False, "ISO-8859-1", _("Western")],
-    [False, "ISO-8859-2", _("Central European")],
-    [False, "ISO-8859-3", _("South European") ],
-    [False, "ISO-8859-4", _("Baltic") ],
-    [False,"ISO-8859-5", _("Cyrillic") ],
-    [False, "ISO-8859-6", _("Arabic") ],
-    [False, "ISO-8859-7", _("Greek") ],
-    [False, "ISO-8859-8", _("Hebrew Visual") ],
-    [False, "ISO-8859-8-I", _("Hebrew") ],
-    [False, "ISO-8859-9", _("Turkish") ],
-    [False, "ISO-8859-10", _("Nordic") ],
-    [False, "ISO-8859-13", _("Baltic") ],
-    [False, "ISO-8859-14", _("Celtic") ],
-    [False, "ISO-8859-15", _("Western") ],
-    [False, "ISO-8859-16", _("Romanian") ],
-    [False, "UTF-7", _("Unicode") ],
-    [False, "UTF-8", _("Unicode") ],
-    [False, "UTF-16", _("Unicode") ],
-    [False, "UCS-2", _("Unicode") ],
-    [False, "UCS-4", _("Unicode") ],
-    [False, "ARMSCII-8", _("Armenian") ],
-    [False, "BIG5", _("Chinese Traditional") ],
-    [False, "BIG5-HKSCS", _("Chinese Traditional") ],
-    [False, "CP866", _("Cyrillic/Russian") ],
-    [False, "EUC-JP", _("Japanese") ],
-    [False, "EUC-KR", _("Korean") ],
-    [False, "EUC-TW", _("Chinese Traditional") ],
-    [False, "GB18030", _("Chinese Simplified") ],
-    [False, "GB2312", _("Chinese Simplified") ],
-    [False, "GBK", _("Chinese Simplified") ],
-    [False, "GEORGIAN-PS", _("Georgian") ],
-    [False, "HZ", _("Chinese Simplified") ],
-    [False, "IBM850", _("Western") ],
-    [False, "IBM852", _("Central European") ],
-    [False, "IBM855", _("Cyrillic") ],
-    [False, "IBM857", _("Turkish") ],
-    [False, "IBM862", _("Hebrew") ],
-    [False, "IBM864", _("Arabic") ],
-    [False, "ISO2022JP", _("Japanese") ],
-    [False, "ISO2022KR", _("Korean") ],
-    [False, "ISO-IR-111", _("Cyrillic") ],
-    [False, "JOHAB", _("Korean") ],
-    [False, "KOI8-R", _("Cyrillic") ],
-    [False, "KOI8-U", _("Cyrillic/Ukrainian") ],
-    [False, "MAC_ARABIC", _("Arabic") ],
-    [False, "MAC_CE", _("Central European") ],
-    [False, "MAC_CROATIAN", _("Croatian") ],
-    [False, "MAC-CYRILLIC", _("Cyrillic") ],
-    [False, "MAC_DEVANAGARI", _("Hindi") ],
-    [False, "MAC_FARSI", _("Persian") ],
-    [False, "MAC_GREEK", _("Greek") ],
-    [False, "MAC_GUJARATI", _("Gujarati") ],
-    [False, "MAC_GURMUKHI", _("Gurmukhi") ],
-    [False, "MAC_HEBREW", _("Hebrew") ],
-    [False, "MAC_ICELANDIC", _("Icelandic") ],
-    [False, "MAC_ROMAN", _("Western") ],
-    [False, "MAC_ROMANIAN", _("Romanian") ],
-    [False, "MAC_TURKISH", _("Turkish") ],
-    [False, "MAC_UKRAINIAN", _("Cyrillic/Ukrainian") ],
-    [False, "SHIFT-JIS", _("Japanese") ],
-    [False, "TCVN", _("Vietnamese") ],
-    [False, "TIS-620", _("Thai") ],
-    [False, "UHC", _("Korean") ],
-    [False, "VISCII", _("Vietnamese") ],
-    [False, "WINDOWS-1250", _("Central European") ],
-    [False, "WINDOWS-1251", _("Cyrillic") ],
-    [False, "WINDOWS-1252", _("Western") ],
-    [False, "WINDOWS-1253", _("Greek") ],
-    [False, "WINDOWS-1254", _("Turkish") ],
-    [False, "WINDOWS-1255", _("Hebrew") ],
-    [False, "WINDOWS-1256", _("Arabic") ],
-    [False, "WINDOWS-1257", _("Baltic") ],
-    [False, "WINDOWS-1258", _("Vietnamese") ]
-  ]
 
-  def get_list():
-    return Encoding.encodings
-  get_list = staticmethod(get_list)
-  
 class TerminatorTerm:
 
   matches = {}
@@ -618,7 +539,7 @@ class TerminatorTerm:
 
     submenu = gtk.Menu()
     item.set_submenu(submenu)
-    encodings = Encoding().get_list()
+    encodings = TerminatorEncoding().get_list()
     encodings.sort(lambda x, y: cmp(x[2].lower(), y[2].lower()))
     group = None
     for encoding in encodings:
diff --git a/terminatorencoding.py b/terminatorencoding.py
new file mode 100644
index 00000000..5851b6be
--- /dev/null
+++ b/terminatorencoding.py
@@ -0,0 +1,108 @@
+#!/usr/bin/python
+#    TerminatorEncoding - charset encoding classes
+#    Copyright (C) 2006-2008  chantra@debuntu.org
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, version 2 only.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+"""TerminatorEncoding by Emmanuel Bretelle <chantra@debuntu.org>
+
+TerminatorEncoding supplies a list of possible encoding
+ values.
+This list is taken from gnome-terminal's src/encoding.h
+ and src/encoding.c
+"""
+
+class TerminatorEncoding:
+  
+  encodings = [
+    [True, None, _("Current Locale")],
+    [False, "ISO-8859-1", _("Western")],
+    [False, "ISO-8859-2", _("Central European")],
+    [False, "ISO-8859-3", _("South European") ],
+    [False, "ISO-8859-4", _("Baltic") ],
+    [False,"ISO-8859-5", _("Cyrillic") ],
+    [False, "ISO-8859-6", _("Arabic") ],
+    [False, "ISO-8859-7", _("Greek") ],
+    [False, "ISO-8859-8", _("Hebrew Visual") ],
+    [False, "ISO-8859-8-I", _("Hebrew") ],
+    [False, "ISO-8859-9", _("Turkish") ],
+    [False, "ISO-8859-10", _("Nordic") ],
+    [False, "ISO-8859-13", _("Baltic") ],
+    [False, "ISO-8859-14", _("Celtic") ],
+    [False, "ISO-8859-15", _("Western") ],
+    [False, "ISO-8859-16", _("Romanian") ],
+    [False, "UTF-7", _("Unicode") ],
+    [False, "UTF-8", _("Unicode") ],
+    [False, "UTF-16", _("Unicode") ],
+    [False, "UCS-2", _("Unicode") ],
+    [False, "UCS-4", _("Unicode") ],
+    [False, "ARMSCII-8", _("Armenian") ],
+    [False, "BIG5", _("Chinese Traditional") ],
+    [False, "BIG5-HKSCS", _("Chinese Traditional") ],
+    [False, "CP866", _("Cyrillic/Russian") ],
+    [False, "EUC-JP", _("Japanese") ],
+    [False, "EUC-KR", _("Korean") ],
+    [False, "EUC-TW", _("Chinese Traditional") ],
+    [False, "GB18030", _("Chinese Simplified") ],
+    [False, "GB2312", _("Chinese Simplified") ],
+    [False, "GBK", _("Chinese Simplified") ],
+    [False, "GEORGIAN-PS", _("Georgian") ],
+    [False, "HZ", _("Chinese Simplified") ],
+    [False, "IBM850", _("Western") ],
+    [False, "IBM852", _("Central European") ],
+    [False, "IBM855", _("Cyrillic") ],
+    [False, "IBM857", _("Turkish") ],
+    [False, "IBM862", _("Hebrew") ],
+    [False, "IBM864", _("Arabic") ],
+    [False, "ISO2022JP", _("Japanese") ],
+    [False, "ISO2022KR", _("Korean") ],
+    [False, "ISO-IR-111", _("Cyrillic") ],
+    [False, "JOHAB", _("Korean") ],
+    [False, "KOI8-R", _("Cyrillic") ],
+    [False, "KOI8-U", _("Cyrillic/Ukrainian") ],
+    [False, "MAC_ARABIC", _("Arabic") ],
+    [False, "MAC_CE", _("Central European") ],
+    [False, "MAC_CROATIAN", _("Croatian") ],
+    [False, "MAC-CYRILLIC", _("Cyrillic") ],
+    [False, "MAC_DEVANAGARI", _("Hindi") ],
+    [False, "MAC_FARSI", _("Persian") ],
+    [False, "MAC_GREEK", _("Greek") ],
+    [False, "MAC_GUJARATI", _("Gujarati") ],
+    [False, "MAC_GURMUKHI", _("Gurmukhi") ],
+    [False, "MAC_HEBREW", _("Hebrew") ],
+    [False, "MAC_ICELANDIC", _("Icelandic") ],
+    [False, "MAC_ROMAN", _("Western") ],
+    [False, "MAC_ROMANIAN", _("Romanian") ],
+    [False, "MAC_TURKISH", _("Turkish") ],
+    [False, "MAC_UKRAINIAN", _("Cyrillic/Ukrainian") ],
+    [False, "SHIFT-JIS", _("Japanese") ],
+    [False, "TCVN", _("Vietnamese") ],
+    [False, "TIS-620", _("Thai") ],
+    [False, "UHC", _("Korean") ],
+    [False, "VISCII", _("Vietnamese") ],
+    [False, "WINDOWS-1250", _("Central European") ],
+    [False, "WINDOWS-1251", _("Cyrillic") ],
+    [False, "WINDOWS-1252", _("Western") ],
+    [False, "WINDOWS-1253", _("Greek") ],
+    [False, "WINDOWS-1254", _("Turkish") ],
+    [False, "WINDOWS-1255", _("Hebrew") ],
+    [False, "WINDOWS-1256", _("Arabic") ],
+    [False, "WINDOWS-1257", _("Baltic") ],
+    [False, "WINDOWS-1258", _("Vietnamese") ]
+  ]
+
+  def get_list():
+    return TerminatorEncoding.encodings
+  get_list = staticmethod(get_list)
+  
\ No newline at end of file