diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
@@ -241,6 +241,119 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
   return;
 }
 
+void QgsProjectParser::owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const
+{
+  // set parentElement id
+  QFileInfo projectFileInfo( mProjectPath );
+  parentElement.setAttribute( "id", "ows-context-"+projectFileInfo.baseName() );
+  // OWSContext General element
+  QDomElement serviceElem = doc.createElement( "Service" );
+
+  QDomElement propertiesElem = mXMLDoc->documentElement().firstChildElement( "properties" );
+  if ( propertiesElem.isNull() )
+  {
+    QgsConfigParser::serviceCapabilities( parentElement, doc );
+    return;
+  }
+
+  QDomElement generalElem = doc.createElement( "General" );
+
+  QDomElement windowElem = doc.createElement( "Window" );
+  windowElem.setAttribute( "height", "600" );
+  windowElem.setAttribute( "width", "800" );
+  generalElem.appendChild( windowElem );
+
+  //WMS title
+  QDomElement titleElem = propertiesElem.firstChildElement( "WMSServiceTitle" );
+  if ( !titleElem.isNull() )
+  {
+    QDomElement wmsTitleElem = doc.createElement( "ows:Title" );
+    QDomText wmsTitleText = doc.createTextNode( titleElem.text() );
+    wmsTitleElem.appendChild( wmsTitleText );
+    generalElem.appendChild( wmsTitleElem );
+  }
+
+  //WMS abstract
+  QDomElement abstractElem = propertiesElem.firstChildElement( "WMSServiceAbstract" );
+  if ( !abstractElem.isNull() )
+  {
+    QDomElement wmsAbstractElem = doc.createElement( "ows:Abstract" );
+    QDomText wmsAbstractText = doc.createTextNode( abstractElem.text() );
+    wmsAbstractElem.appendChild( wmsAbstractText );
+    generalElem.appendChild( wmsAbstractElem );
+  }
+
+  //keyword list
+  QDomElement keywordListElem = propertiesElem.firstChildElement( "WMSKeywordList" );
+  if ( !keywordListElem.isNull() )
+  {
+    bool siaFormat = featureInfoFormatSIA2045();
+
+    QDomElement keywordsElem = doc.createElement( "ows:Keywords" );
+    QDomNodeList keywordList = keywordListElem.elementsByTagName( "value" );
+    for ( int i = 0; i < keywordList.size(); ++i )
+    {
+      QDomElement keywordElem = doc.createElement( "ows:Keyword" );
+      QDomText keywordText = doc.createTextNode( keywordList.at( i ).toElement().text() );
+      keywordElem.appendChild( keywordText );
+      if ( siaFormat )
+      {
+        keywordElem.setAttribute( "vocabulary", "SIA_Geo405" );
+      }
+      keywordsElem.appendChild( keywordElem );
+    }
+
+    if ( keywordList.size() > 0 )
+    {
+      serviceElem.appendChild( keywordsElem );
+    }
+  }
+
+  parentElement.appendChild( generalElem );
+
+  // OWSContext ResourceList element
+  QStringList nonIdentifiableLayers = identifyDisabledLayers();
+  if ( mProjectLayerElements.size() < 1 )
+  {
+    return;
+  }
+
+  QgsRectangle combinedBBox;
+  QMap<QString, QgsMapLayer *> layerMap;
+  projectLayerMap( layerMap );
+
+  QDomElement legendElem = mXMLDoc->documentElement().firstChildElement( "legend" );
+
+  QDomElement resourceListElem = doc.createElement( "ResourceList" );
+
+  addOWSLayers( doc, resourceListElem, legendElem, layerMap, nonIdentifiableLayers, strHref, combinedBBox, "" );
+
+  parentElement.appendChild( resourceListElem );
+
+  QgsRectangle mapRect = mapRectangle();
+  if ( !mapRect.isEmpty() )
+  {
+    combinedBBox = mapRect;
+  }
+  const QgsCoordinateReferenceSystem& projectCrs = projectCRS();
+  QDomElement bboxElem = doc.createElement( "ows:BoundingBox" );
+  bboxElem.setAttribute( "crs", projectCrs.authid() );
+  if ( projectCrs.axisInverted() )
+  {
+    combinedBBox.invert();
+  }
+  QDomElement lowerCornerElem = doc.createElement( "ows:LowerCorner" );
+  QDomText lowerCornerText = doc.createTextNode( QString::number( combinedBBox.xMinimum() ) +" "+  QString::number( combinedBBox.yMinimum() ));
+  lowerCornerElem.appendChild( lowerCornerText );
+  bboxElem.appendChild( lowerCornerElem );
+  QDomElement upperCornerElem = doc.createElement( "ows:upperCorner" );
+  QDomText upperCornerText = doc.createTextNode( QString::number( combinedBBox.xMaximum() ) +" "+  QString::number( combinedBBox.yMaximum() ));
+  upperCornerElem.appendChild( upperCornerText );
+  bboxElem.appendChild( upperCornerElem );
+  generalElem.appendChild( bboxElem );
+
+}
+
 void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const
 {
   if ( mProjectLayerElements.size() < 1 )
@@ -642,7 +755,7 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
       QString metadataUrl = currentLayer->metadataUrl();
       if ( !metadataUrl.isEmpty() )
       {
-        QDomElement metaUrlElem = doc.createElement( "MetadataUrl" );
+        QDomElement metaUrlElem = doc.createElement( "MetadataURL" );
         QString metadataUrlType = currentLayer->metadataUrlType();
         if ( !metadataUrlType.isEmpty() )
         {
@@ -729,6 +842,277 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
   }
 }
 
+void QgsProjectParser::addOWSLayers( QDomDocument &doc,
+                                  QDomElement &parentElem,
+                                  const QDomElement &legendElem,
+                                  const QMap<QString, QgsMapLayer *> &layerMap,
+                                  const QStringList &nonIdentifiableLayers,
+                                  const QString& strHref,
+                                  QgsRectangle& combinedBBox,
+                                  QString strGroup) const
+{
+  const QgsCoordinateReferenceSystem& projectCrs = projectCRS();
+  QDomNodeList legendChildren = legendElem.childNodes();
+  for ( int i = 0; i < legendChildren.size(); ++i )
+  {
+    QDomElement currentChildElem = legendChildren.at( i ).toElement();
+
+    if ( currentChildElem.tagName() == "legendgroup" )
+    {
+      QString name = currentChildElem.attribute( "name" );
+      if ( mRestrictedLayers.contains( name ) ) //unpublished group
+      {
+        continue;
+      }
+      QString group;
+      if ( strGroup.isEmpty() )
+      {
+        group = name;
+      }
+      else
+      {
+        group = strGroup +"/"+ name;
+      }
+
+      if ( currentChildElem.attribute( "embedded" ) == "1" )
+      {
+        //add layers from other project files and embed into this group
+        QString project = convertToAbsolutePath( currentChildElem.attribute( "project" ) );
+        QgsDebugMsg( QString( "Project path: %1" ).arg( project ) );
+        QString embeddedGroupName = currentChildElem.attribute( "name" );
+        QgsProjectParser* p = dynamic_cast<QgsProjectParser*>( QgsConfigCache::instance()->searchConfiguration( project ) );
+        QList<QDomElement> embeddedGroupElements = p->mLegendGroupElements;
+        if ( p )
+        {
+          QStringList pIdDisabled = p->identifyDisabledLayers();
+
+          QDomElement embeddedGroupElem;
+          foreach ( const QDomElement &elem, embeddedGroupElements )
+          {
+            if ( elem.attribute( "name" ) == embeddedGroupName )
+            {
+              embeddedGroupElem = elem;
+              break;
+            }
+          }
+
+          QMap<QString, QgsMapLayer *> pLayerMap;
+          QList<QDomElement> embeddedProjectLayerElements = p->mProjectLayerElements;
+          foreach ( const QDomElement &elem, embeddedProjectLayerElements )
+          {
+            pLayerMap.insert( layerId( elem ), p->createLayerFromElement( elem ) );
+          }
+
+          p->addOWSLayers( doc, parentElem, embeddedGroupElem, pLayerMap, pIdDisabled, strHref, combinedBBox, group );
+        }
+      }
+      else //normal (not embedded) legend group
+      {
+        addOWSLayers( doc, parentElem, currentChildElem, layerMap, nonIdentifiableLayers, strHref, combinedBBox, group );
+      }
+
+      // combine bounding boxes of children (groups/layers)
+      // combineExtentAndCrsOfGroupChildren( layerElem, doc );
+    }
+    else if ( currentChildElem.tagName() == "legendlayer" )
+    {
+      QDomElement layerElem = doc.createElement( "Layer" );
+      QString id = layerIdFromLegendLayer( currentChildElem );
+
+      if ( !layerMap.contains( id ) )
+      {
+        QgsDebugMsg( QString( "layer %1 not found in map - layer cache to small?" ).arg( id ) );
+        continue;
+      }
+
+      QgsMapLayer *currentLayer = layerMap[ id ];
+      if ( !currentLayer )
+      {
+        QgsDebugMsg( QString( "layer %1 not found" ).arg( id ) );
+        continue;
+      }
+
+      if ( mRestrictedLayers.contains( currentLayer->name() ) ) //unpublished layer
+      {
+        continue;
+      }
+      if ( nonIdentifiableLayers.contains( currentLayer->id() ) )
+      {
+        layerElem.setAttribute( "queryable", "false" );
+      }
+      else
+      {
+        layerElem.setAttribute( "queryable", "true" );
+      }
+
+      // is the layer visible ?
+      if ( currentChildElem.firstChildElement().firstChildElement().attribute( "visible" ) == "1" )
+      {
+        layerElem.setAttribute( "hidden", "false" );
+      }
+      else
+      {
+        layerElem.setAttribute( "hidden", "true" );
+      }
+
+      if (!strGroup.isEmpty() )
+      {
+        layerElem.setAttribute( "group", strGroup );
+      }
+      // Because Layer transparency is used for the rendering
+      // OWSContext Layer opacity is set to 1
+      layerElem.setAttribute( "opacity", 1 );
+
+      QString lyrname = currentLayer->name();
+      layerElem.setAttribute( "name", lyrname );
+
+      // define an id based on layer name
+      layerElem.setAttribute( "id", lyrname.replace( QRegExp( "[\\W]" ), "_" ) );
+
+      QDomElement titleElem = doc.createElement( "ows:Title" );
+      QString titleName = currentLayer->title();
+      if ( titleName.isEmpty() )
+      {
+        titleName = currentLayer->name();
+      }
+      QDomText titleText = doc.createTextNode( titleName );
+      titleElem.appendChild( titleText );
+      layerElem.appendChild( titleElem );
+
+      QDomElement formatElem = doc.createElement( "ows:OutputFormat" );
+      QDomText formatText = doc.createTextNode( "image/png" );
+      formatElem.appendChild( formatText );
+      layerElem.appendChild( formatElem );
+
+      QDomElement serverElem = doc.createElement( "Server" );
+      serverElem.setAttribute( "service", "urn:ogc:serviceType:WMS" );
+      serverElem.setAttribute( "version", "1.3.0" );
+      serverElem.setAttribute( "default", "true" );
+      QDomElement orServerElem = doc.createElement( "OnlineResource" );
+      orServerElem.setAttribute( "xlink:href", strHref );
+      serverElem.appendChild( orServerElem );
+      layerElem.appendChild( serverElem );
+
+      QString abstract = currentLayer->abstract();
+      if ( !abstract.isEmpty() )
+      {
+        QDomElement abstractElem = doc.createElement( "ows:Abstract" );
+        QDomText abstractText = doc.createTextNode( abstract );
+        abstractElem.appendChild( abstractText );
+        layerElem.appendChild( abstractElem );
+      }
+
+      //min/max scale denominatormScaleBasedVisibility
+      if ( currentLayer->hasScaleBasedVisibility() )
+      {
+        QString minScaleString = QString::number( currentLayer->minimumScale() );
+        QString maxScaleString = QString::number( currentLayer->maximumScale() );
+        QDomElement minScaleElem = doc.createElement( "sld:MinScaleDenominator" );
+        QDomText minScaleText = doc.createTextNode( minScaleString );
+        minScaleElem.appendChild( minScaleText );
+        layerElem.appendChild( minScaleElem );
+        QDomElement maxScaleElem = doc.createElement( "sld:MaxScaleDenominator" );
+        QDomText maxScaleText = doc.createTextNode( maxScaleString );
+        maxScaleElem.appendChild( maxScaleText );
+        layerElem.appendChild( maxScaleElem );
+      }
+
+      /*
+      //CRS
+      QStringList crsList = createCRSListForLayer( currentLayer );
+      appendCRSElementsToLayer( layerElem, doc, crsList );
+
+      //Ex_GeographicBoundingBox
+      appendLayerBoundingBoxes( layerElem, doc, currentLayer->extent(), currentLayer->crs() );
+      */
+      //get project crs
+      const QgsCoordinateReferenceSystem& layerCrs = currentLayer->crs();
+      QgsCoordinateTransform t( layerCrs, projectCrs );
+
+      //transform
+      QgsRectangle BBox = t.transformBoundingBox( currentLayer->extent() );
+      if ( combinedBBox.isEmpty() )
+      {
+        combinedBBox = BBox;
+      }
+      else
+      {
+        combinedBBox.combineExtentWith( &BBox );
+      }
+
+      QDomElement styleListElem = doc.createElement( "StyleList" );
+      //only one default style in project file mode
+      QDomElement styleElem = doc.createElement( "Style" );
+      styleElem.setAttribute( "current", "true" );
+      QDomElement styleNameElem = doc.createElement( "Name" );
+      QDomText styleNameText = doc.createTextNode( "default" );
+      styleNameElem.appendChild( styleNameText );
+      QDomElement styleTitleElem = doc.createElement( "Title" );
+      QDomText styleTitleText = doc.createTextNode( "default" );
+      styleTitleElem.appendChild( styleTitleText );
+      styleElem.appendChild( styleNameElem );
+      styleElem.appendChild( styleTitleElem );
+      styleListElem.appendChild( styleElem );
+      layerElem.appendChild( styleListElem );
+
+      //keyword list
+      QStringList keywordStringList = currentLayer->keywordList().split( "," );
+      if ( keywordStringList.size() > 0 )
+      {
+        bool siaFormat = featureInfoFormatSIA2045();
+
+        QDomElement keywordsElem = doc.createElement( "ows:Keywords" );
+        for ( int i = 0; i < keywordStringList.size(); ++i )
+        {
+          QDomElement keywordElem = doc.createElement( "ows:Keyword" );
+          QDomText keywordText = doc.createTextNode( keywordStringList.at( i ).trimmed() );
+          keywordElem.appendChild( keywordText );
+          if ( siaFormat )
+          {
+            keywordElem.setAttribute( "vocabulary", "SIA_Geo405" );
+          }
+          keywordsElem.appendChild( keywordElem );
+        }
+        layerElem.appendChild( keywordsElem );
+      }
+
+      // layer metadata URL
+      QString metadataUrl = currentLayer->metadataUrl();
+      if ( !metadataUrl.isEmpty() )
+      {
+        QDomElement metaUrlElem = doc.createElement( "MetadataURL" );
+        QString metadataUrlType = currentLayer->metadataUrlType();
+        if ( !metadataUrlType.isEmpty() )
+        {
+          metaUrlElem.setAttribute( "type", metadataUrlType );
+        }
+        QString metadataUrlFormat = currentLayer->metadataUrlFormat();
+        if ( !metadataUrlFormat.isEmpty() )
+        {
+          QDomElement metaUrlFormatElem = doc.createElement( "Format" );
+          QDomText metaUrlFormatText = doc.createTextNode( metadataUrlFormat );
+          metaUrlFormatElem.appendChild( metaUrlFormatText );
+          metaUrlElem.appendChild( metaUrlFormatElem );
+        }
+        QDomElement metaUrlORElem = doc.createElement( "OnlineResource" );
+        metaUrlORElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
+        metaUrlORElem.setAttribute( "xlink:type", "simple" );
+        metaUrlORElem.setAttribute( "xlink:href", metadataUrl );
+        metaUrlElem.appendChild( metaUrlORElem );
+        layerElem.appendChild( metaUrlElem );
+      }
+
+      parentElem.appendChild( layerElem );
+    }
+    else
+    {
+      QgsDebugMsg( "unexpected child element" );
+      continue;
+    }
+
+  }
+}
+
 void QgsProjectParser::addLayerProjectSettings( QDomElement& layerElem, QDomDocument& doc, QgsMapLayer* currentLayer )
 {
   if ( !currentLayer )
@@ -1909,7 +2293,8 @@ QList<QDomElement> QgsProjectParser::publishedComposerElements() const
 
 void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const
 {
-  if ( doc.documentElement().tagName() == "WFS_Capabilities" )
+  QString docElementTagName = doc.documentElement().tagName();
+  if ( docElementTagName == "WFS_Capabilities" )
   {
     serviceWFSCapabilities( parentElement, doc );
     return;

diff --git a/src/mapserver/qgsprojectparser.h b/src/mapserver/qgsprojectparser.h
@@ -45,6 +45,8 @@ class QgsProjectParser: public QgsConfigParser
 
     virtual void featureTypeList( QDomElement& parentElement, QDomDocument& doc ) const;
 
+    virtual void owsGeneralAndResourceList( QDomElement& parentElement, QDomDocument& doc, const QString& strHref ) const;
+
     virtual void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const;
     /**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/
     virtual QList<QgsMapLayer*> mapLayerFromTypeName( const QString& tName, bool useCache = true ) const;
@@ -186,6 +188,15 @@ class QgsProjectParser: public QgsConfigParser
                     QString version, //1.1.1 or 1.3.0
                     bool fullProjectSettings = false ) const;
 
+    void addOWSLayers( QDomDocument &doc,
+                       QDomElement &parentElem,
+                       const QDomElement &legendElem,
+                       const QMap<QString, QgsMapLayer *> &layerMap,
+                       const QStringList &nonIdentifiableLayers,
+                       const QString& strHref,
+                       QgsRectangle& combinedBBox,
+                       QString strGroup ) const;
+
     static void addLayerProjectSettings( QDomElement& layerElem, QDomDocument& doc, QgsMapLayer* currentLayer );
 
     /**@param considerMapExtent Take user-defined map extent instead of data-calculated extent if present in project file*/

diff --git a/src/mapserver/qgssldparser.h b/src/mapserver/qgssldparser.h
@@ -56,7 +56,9 @@ class QgsSLDParser: public QgsConfigParser
     /**Adds layer and style specific capabilities elements to the parent node. This includes the individual layers and styles, their description, native CRS, bounding boxes, etc.*/
     void layersAndStylesCapabilities( QDomElement& parentElement, QDomDocument& doc, const QString& version, bool fullProjectSettings = false ) const;
 
-    void featureTypeList( QDomElement &, QDomDocument & ) const {}
+    void featureTypeList( QDomElement&, QDomDocument& ) const {}
+
+    void owsGeneralAndResourceList( QDomElement&, QDomDocument& , const QString& ) const {}
 
     void describeFeatureType( const QString& , QDomElement& , QDomDocument& ) const {}
     /**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -249,6 +249,40 @@ QDomDocument QgsWMSServer::getCapabilities( QString version, bool fullProjectInf
   return doc;
 }
 
+QDomDocument QgsWMSServer::getContext()
+{
+  QDomDocument doc;
+  addXMLDeclaration( doc );
+  QDomElement owsContextElem = doc.createElement( "OWSContext" );
+  owsContextElem.setAttribute( "xmlns", "http://www.opengis.net/ows-context" );
+  owsContextElem.setAttribute( "xmlns:ows-context", "http://www.opengis.net/ows-context" );
+  owsContextElem.setAttribute( "xmlns:context", "http://www.opengis.net/context" );
+  owsContextElem.setAttribute( "xmlns:ows", "http://www.opengis.net/ows" );
+  owsContextElem.setAttribute( "xmlns:sld", "http://www.opengis.net/sld" );
+  owsContextElem.setAttribute( "xmlns:ogc", "http://www.opengis.net/ogc" );
+  owsContextElem.setAttribute( "xmlns:gml", "http://www.opengis.net/gml" );
+  owsContextElem.setAttribute( "xmlns:kml", "http://www.opengis.net/kml/2.2" );
+  owsContextElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
+  owsContextElem.setAttribute( "xmlns:ns9", "http://www.w3.org/2005/Atom" );
+  owsContextElem.setAttribute( "xmlns:xal", "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0");
+  owsContextElem.setAttribute( "xmlns:ins", "http://www.inspire.org" );
+  owsContextElem.setAttribute( "version", "0.3.1" );
+  doc.appendChild( owsContextElem );
+
+  if ( mConfigParser )
+  {
+    //Prepare url
+    QString hrefString = mConfigParser->serviceUrl();
+    if ( hrefString.isEmpty() )
+    {
+      hrefString = serviceUrl();
+    }
+    mConfigParser->owsGeneralAndResourceList( owsContextElem, doc, hrefString );
+  }
+
+  return doc;
+}
+
 QImage* QgsWMSServer::getLegendGraphics()
 {
   if ( !mConfigParser || !mMapRenderer )

diff --git a/src/mapserver/qgswmsserver.h b/src/mapserver/qgswmsserver.h
@@ -60,6 +60,8 @@ class QgsWMSServer
         @param version WMS version (1.1.1 or 1.3.0)
         @param fullProjectInformation If true: add extended project information (does not validate against WMS schema)*/
     QDomDocument getCapabilities( QString version = "1.3.0", bool fullProjectInformation = false );
+
+    QDomDocument getContext();
     /**Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership
     of the image object*/
     QImage* getLegendGraphics();