diff --git a/data/man/update_man.py b/data/man/update_man.py
index c44b8dc1a..9b744f7c3 100644
--- a/data/man/update_man.py
+++ b/data/man/update_man.py
@@ -52,11 +52,11 @@ SPHINXBUILD   = 'sphinx-build'
 if sys.platform == 'win32':          
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
     sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
-elif sys.platform == 'linux2' or os.name == 'darwin':
+elif sys.platform in ['linux2', 'darwin', 'cygwin']:
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
     sphinxCmd = SPHINXBUILD
 else:
-    print ("ERROR: unknown system, don't know sphinx, ... commands")
+    print ("Update Man ERROR: unknown system, don't know sphinx, ... commands")
     sys.exit(0)
 
 def tests():
diff --git a/docs/update_doc.py b/docs/update_doc.py
index 352942230..b4cbe3b39 100644
--- a/docs/update_doc.py
+++ b/docs/update_doc.py
@@ -42,11 +42,11 @@ SPHINXBUILD   = 'sphinx-build'
 if sys.platform == 'win32':          
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python.exe')
     sphinxCmd = os.path.join(sys.prefix, 'bin', 'sphinx-build.exe')
-elif sys.platform == 'linux2' or os.name == 'darwin':
+elif sys.platform in ['linux2', 'darwin', 'cygwin']:
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
     sphinxCmd = SPHINXBUILD
 else:
-    print ("ERROR: unknown system, don't know sphinx, ... commands")
+    print ("Update Docs ERROR: unknown system, don't know sphinx, ... commands")
     sys.exit(0)
 
 def tests():
diff --git a/po/update_po.py b/po/update_po.py
index 83d08c902..12c6688f8 100644
--- a/po/update_po.py
+++ b/po/update_po.py
@@ -65,14 +65,15 @@ if sys.platform == 'win32':
 
 # Others OS
 
-elif sys.platform == 'linux2' or os.name == 'darwin':
+elif sys.platform in ['linux2', 'darwin', 'cygwin']:
     msgmergeCmd = 'msgmerge'
     msgfmtCmd = 'msgfmt'
     msgattribCmd = 'msgattrib'
     xgettextCmd = 'xgettext'
     pythonCmd = os.path.join(sys.prefix, 'bin', 'python')
 else:
-    print ("ERROR: unknown system, don't know msgmerge, ... commands")
+    print("Found platform %s, OS %s" % (sys.platform, os.name))
+    print ("Update PO ERROR: unknown system, don't know msgmerge, ... commands")
     sys.exit(0)
 
 # List of available languages, useful for grouped actions