diff --git a/curses/curses_misc.py b/curses/curses_misc.py
old mode 100644
new mode 100755
diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py
old mode 100644
new mode 100755
diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
old mode 100644
new mode 100755
diff --git a/in/scripts=wicd-curses.in b/in/scripts=wicd-curses.in
new file mode 100755
index 0000000..9b56c42
--- /dev/null
+++ b/in/scripts=wicd-curses.in
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec python -O %LIB%wicd-curses.py $@
diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in
index 2cf55ec..33282e7 100755
--- a/in/wicd=wpath.py.in
+++ b/in/wicd=wpath.py.in
@@ -64,6 +64,7 @@ no_install_man = %NO_INSTALL_MAN%
 no_install_kde = %NO_INSTALL_KDE%
 no_install_acpi = %NO_INSTALL_ACPI%
 no_install_docs = %NO_INSTALL_DOCS%
+no_install_ncurses = %NO_INSTALL_NCURSES%
 
 def chdir(file):
     """Change directory to the location of the specified file.
diff --git a/setup.py b/setup.py
index 65ee989..a1e2efb 100755
--- a/setup.py
+++ b/setup.py
@@ -84,7 +84,8 @@ class configure(Command):
         ('no-install-kde', None, 'do not install the kde autostart file'),
         ('no-install-acpi', None, 'do not install the suspend.d and resume.d acpi scripts'),
         ('no-install-pmutils', None, 'do not install the pm-utils hooks'),
-        ('no-install-docs', None, 'do not install the auxiliary documentation')
+        ('no-install-docs', None, 'do not install the auxiliary documentation'),
+        ('no-install-ncurses', None, 'do not install the ncurses client')
         ]
         
 
@@ -117,6 +118,7 @@ class configure(Command):
         self.no_install_acpi = False
         self.no_install_pmutils = False
         self.no_install_docs = False
+        self.no_install_ncurses = False
 
         # Determine the default init file location on several different distros
         
@@ -392,6 +394,11 @@ try:
     (wpath.backends, ['wicd/backends/be-external.py', 'wicd/backends/be-ioctl.py']),
     (wpath.autostart, ['other/wicd-tray.desktop', ]),
     ]
+    if not wpath.no_install_ncurses:
+        data.append(( wpath.lib, ['curses/curses_misc.py']))
+        data.append(( wpath.lib, ['curses/prefs_curses.py']))
+        data.append(( wpath.lib, ['curses/wicd-curses.py']))
+        data.append(( wpath.bin, ['scripts/wicd-curses'])) 
     piddir = os.path.dirname(wpath.pidfile)
     if not piddir.endswith('/'):
         piddir += '/'