diff --git a/doc/terminator.1 b/doc/terminator.1
index 9d3af4fc..b2fd01fa 100644
--- a/doc/terminator.1
+++ b/doc/terminator.1
@@ -61,9 +61,6 @@ Use the specified FILE for configuration
 .B \-r, \-\-role=ROLE
 Set a custom WM_WINDOW_ROLE property on the window
 .TP
-.B \-c, \-\-classname=CLASSNAME
-Set a custom name (WM_CLASS) property on the window
-.TP
 .B \-l, \-\-layout=LAYOUT
 Start Terminator with a specific layout. The argument here is the name
 of a saved layout.
diff --git a/terminatorlib/optionparse.py b/terminatorlib/optionparse.py
index 28c99e6c..d274b363 100755
--- a/terminatorlib/optionparse.py
+++ b/terminatorlib/optionparse.py
@@ -79,8 +79,6 @@ def parse_options():
                    'inside the terminal, and its arguments'))
     parser.add_option('--working-directory', metavar='DIR',
             dest='working_directory', help=_('Set the working directory'))
-    parser.add_option('-c', '--classname', dest='classname', help=_('Set a \
-custom name (WM_CLASS) property on the window'))
     parser.add_option('-i', '--icon', dest='forcedicon', help=_('Set a custom \
 icon for the window (by file or name)'))
     parser.add_option('-r', '--role', dest='role', 
diff --git a/terminatorlib/window.py b/terminatorlib/window.py
index 6483f70c..0e8ed02e 100755
--- a/terminatorlib/window.py
+++ b/terminatorlib/window.py
@@ -83,9 +83,6 @@ class Window(Container, Gtk.Window):
             if options.role:
                 self.set_role(options.role)
             
-#            if options.classname is not None:
-#                self.set_wmclass(options.classname, self.wmclass_class)
-            
             if options.forcedicon is not None:
                 icon_to_apply = options.forcedicon