diff --git a/bindings/python/mapnik/ogcserver/__init__.py b/bindings/python/mapnik/ogcserver/__init__.py
index a2cd90f6f..1abe6addf 100644
--- a/bindings/python/mapnik/ogcserver/__init__.py
+++ b/bindings/python/mapnik/ogcserver/__init__.py
@@ -17,4 +17,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
-# $Id$
\ No newline at end of file
+# $Id$
+
+"""Mapnik OGC WMS Server."""
diff --git a/bindings/python/mapnik/ogcserver/cgiserver.py b/bindings/python/mapnik/ogcserver/cgiserver.py
index 465b6c6cf..53673cdc9 100644
--- a/bindings/python/mapnik/ogcserver/cgiserver.py
+++ b/bindings/python/mapnik/ogcserver/cgiserver.py
@@ -19,6 +19,12 @@
 #
 # $Id$
 
+"""CGI/FastCGI handler for Mapnik OGC WMS Server.
+
+Requires 'jon' module.
+
+"""
+
 from os import environ
 from tempfile import gettempdir
 environ['PYTHON_EGG_CACHE'] = gettempdir()
diff --git a/bindings/python/mapnik/ogcserver/exceptions.py b/bindings/python/mapnik/ogcserver/exceptions.py
index c814903d4..0ef7dcaf0 100644
--- a/bindings/python/mapnik/ogcserver/exceptions.py
+++ b/bindings/python/mapnik/ogcserver/exceptions.py
@@ -19,6 +19,8 @@
 #
 # $Id$
 
+"""Custom OGCServer Exceptions"""
+
 class OGCException(Exception):
     pass
 
diff --git a/bindings/python/mapnik/ogcserver/modserver.py b/bindings/python/mapnik/ogcserver/modserver.py
index fd190d13d..beacbd3b3 100755
--- a/bindings/python/mapnik/ogcserver/modserver.py
+++ b/bindings/python/mapnik/ogcserver/modserver.py
@@ -19,6 +19,8 @@
 #
 # $Id: modserver.py 283 2006-07-22 18:54:53Z jdoyon $
 
+"""Mod_python handler for Mapnik OGC WMS Server."""
+
 import sys
 from mod_python import apache, util
 from exceptions import OGCException, ServerConfigurationError
diff --git a/bindings/python/mapnik/ogcserver/wms111.py b/bindings/python/mapnik/ogcserver/wms111.py
index fc37527d4..914ac7f78 100644
--- a/bindings/python/mapnik/ogcserver/wms111.py
+++ b/bindings/python/mapnik/ogcserver/wms111.py
@@ -19,6 +19,8 @@
 #
 # $Id$
 
+"""WMS 1.1.1 compliant GetCapabilities, GetMap, GetFeatureInfo, and Exceptions interface."""
+
 from common import ParameterDefinition, Response, Version, ListFactory, \
                    ColorFactory, CRSFactory, WMSBaseServiceHandler, CRS, \
                    BaseExceptionHandler, Projection
diff --git a/bindings/python/mapnik/ogcserver/wms130.py b/bindings/python/mapnik/ogcserver/wms130.py
index 25d6ab9d8..3d7cbff7a 100644
--- a/bindings/python/mapnik/ogcserver/wms130.py
+++ b/bindings/python/mapnik/ogcserver/wms130.py
@@ -19,6 +19,8 @@
 #
 # $Id$
 
+"""WMS 1.3.0 compliant GetCapabilities, GetMap, GetFeatureInfo, and Exceptions interface."""
+
 from common import ParameterDefinition, Response, Version, ListFactory, \
                    ColorFactory, CRSFactory, CRS, WMSBaseServiceHandler, \
                    BaseExceptionHandler, Projection
diff --git a/bindings/python/mapnik/ogcserver/wsgi.py b/bindings/python/mapnik/ogcserver/wsgi.py
index e31580803..8b576ecb1 100644
--- a/bindings/python/mapnik/ogcserver/wsgi.py
+++ b/bindings/python/mapnik/ogcserver/wsgi.py
@@ -19,6 +19,8 @@
 #
 # $Id$
 
+"""WSGI application wrapper for Mapnik OGC WMS Server."""
+
 from exceptions import OGCException, ServerConfigurationError
 from configparser import SafeConfigParser
 from cgi import parse_qs