diff --git a/cli/README b/cli/README.cli
similarity index 100%
rename from cli/README
rename to cli/README.cli
diff --git a/curses/README b/curses/README.curses
similarity index 100%
rename from curses/README
rename to curses/README.curses
diff --git a/curses/TODO b/curses/TODO.curses
similarity index 100%
rename from curses/TODO
rename to curses/TODO.curses
diff --git a/setup.py b/setup.py
index 9ac1254..6e7814e 100755
--- a/setup.py
+++ b/setup.py
@@ -507,11 +507,16 @@ try:
         data.append((wpath.bin, ['scripts/wicd-curses'])) 
         if not wpath.no_install_man:
             data.append(( wpath.mandir + 'man8/', ['man/wicd-curses.8'])) 
+        if not wpath.no_install_docs:
+            data.append(( wpath.docdir, ['curses/README.curses'])) 
+            data.append(( wpath.docdir, ['curses/TODO.curses'])) 
     if not wpath.no_install_cli:
         data.append((wpath.lib, ['cli/wicd-cli.py']))
         data.append((wpath.bin, ['scripts/wicd-cli'])) 
         if not wpath.no_install_man:
             data.append(( wpath.mandir + 'man8/', ['man/wicd-cli.8'])) 
+        if not wpath.no_install_docs:
+            data.append(( wpath.docdir, ['cli/README.cli'])) 
     piddir = os.path.dirname(wpath.pidfile)
     if not piddir.endswith('/'):
         piddir += '/'