diff --git a/setup.py b/setup.py
index d43c6f25..d87e5796 100755
--- a/setup.py
+++ b/setup.py
@@ -77,8 +77,10 @@ class Install(install):
                                and not m[0].endswith('__')]
 
             for member in section_members:
-                pisiconf.write("%s = %s\n" % (member[0], member[1]))
-
+                if member[1] == None or member[1] == "":
+                    pisiconf.write("# %s = %s\n" % (member[0], member[1]))
+                else:
+                    pisiconf.write("%s = %s\n" % (member[0], member[1]))
             pisiconf.write('\n')