diff --git a/src/app/qgsmaptoolfreezelabels.cpp b/src/app/qgsmaptoolfreezelabels.cpp
diff --git a/src/app/qgsmaptoolfreezelabels.h b/src/app/qgsmaptoolfreezelabels.h
@@ -0,0 +1,100 @@
+/***************************************************************************
+                          qgsmaptoolfreezelabels.h
+                          --------------------
+    begin                : 2012-07-12
+    copyright            : (C) 2012 by Larry Shaffer
+    email                : larrys at dakotacarto dot com
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSMAPTOOLFREEZELABELS_H
+#define QGSMAPTOOLFREEZELABELS_H
+
+#include "qgsmaptoollabel.h"
+#include "qgsrectangle.h"
+#include "qgslegend.h"
+#include "qgscoordinatetransform.h"
+
+class QgsHighlight;
+class QgsLabelPosition;
+
+/**A map tool for freezing (writing to attribute table) and thawing label positions and rotation*/
+class QgsMapToolFreezeLabels: public QgsMapToolLabel
+{
+    Q_OBJECT
+
+  public:
+    QgsMapToolFreezeLabels( QgsMapCanvas *canvas );
+    ~QgsMapToolFreezeLabels();
+
+    //! Overridden mouse move event
+    virtual void canvasMoveEvent( QMouseEvent * e );
+
+    //! Overridden mouse press event
+    virtual void canvasPressEvent( QMouseEvent * e );
+
+    //! Overridden mouse release event
+    virtual void canvasReleaseEvent( QMouseEvent * e );
+
+    bool isShowingFrozen() const { return mShowFrozen; }
+    void setShowingFrozen( bool showing ) { mShowFrozen = showing; }
+
+    //! Called when Show Frozen Labels tool is toggled, via its qgisapp.cpp slot
+    void showFrozenLabels( bool show );
+
+    //! Remove rectangles from around frozen labels
+    void removeFrozenHighlights();
+
+  public slots:
+
+    //! Update frozen label highlights on layer edit mode change
+    void updateFrozenLabels();
+
+    //! Render highlight rectangles around frozen labels
+    void highlightFrozenLabels();
+
+  protected:
+
+    //! Mapping of feature ids of layers that have been highlighted
+    QMap<QString, QgsHighlight*> mHighlights;
+
+    //! Flag to indicate a map canvas drag operation is taking place
+    bool mDragging;
+    //! Flag to indicate whether to draw the highlight for frozen labels
+    bool mShowFrozen;
+
+    //! Stores actual select rect
+    QRect mSelectRect;
+
+    //! Stores selection marquee
+    QgsRubberBand* mRubberBand;
+
+  private:
+
+    //! Pointer to map renderer
+    QgsMapRenderer* mRender;
+
+    //! Highlights a given label relative to whether its frozen and editable
+    void highlightLabel( QgsVectorLayer* vlayer,
+                         const QgsLabelPosition& labelpos,
+                         const QString& id,
+                         const QColor& color );
+
+    //! Select valid labels to freeze or thaw
+    void freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e  );
+
+    //! Freeze or thaw label relative to whether its editable
+    bool freezeThawLabel( QgsVectorLayer* vlayer,
+                          const QgsLabelPosition& labelpos,
+                          bool freeze );
+};
+
+#endif // QGSMAPTOOLFREEZELABELS_H
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
@@ -449,3 +449,38 @@ bool QgsMapToolLabel::labelMoveable( const QgsMapLayer* ml, int& xCol, int& yCol
 
   return true;
 }
+
+bool QgsMapToolLabel::layerCanFreeze( const QgsMapLayer* ml, int& xCol, int& yCol ) const
+{
+  const QgsVectorLayer* vlayer = dynamic_cast<const QgsVectorLayer*>( ml );
+  if ( !vlayer || !vlayer->isEditable() )
+  {
+    return false;
+  }
+
+  bool xColOk, yColOk;
+
+  QVariant xColumn = ml->customProperty( "labeling/dataDefinedProperty9" );
+  if ( !xColumn.isValid() )
+  {
+    return false;
+  }
+  xCol = xColumn.toInt( &xColOk );
+  if ( !xColOk )
+  {
+    return false;
+  }
+
+  QVariant yColumn = ml->customProperty( "labeling/dataDefinedProperty10" );
+  if ( !yColumn.isValid() )
+  {
+    return false;
+  }
+  yCol = yColumn.toInt( &yColOk );
+  if ( !yColOk )
+  {
+    return false;
+  }
+
+  return true;
+}
diff --git a/src/app/qgsmaptoollabel.h b/src/app/qgsmaptoollabel.h
@@ -41,6 +41,11 @@ class QgsMapToolLabel: public QgsMapTool
         @param yCol out: index of the attribute for data defined y coordinate
         @return true if labels of layer can be moved*/
     bool diagramMoveable( const QgsMapLayer* ml, int& xCol, int& yCol ) const;
+    /**Returns true if layer has attribute fields set up
+        @param xCol out: index of the attribute for data defined x coordinate
+        @param yCol out: index of the attribute for data defined y coordinate
+        @return true if layer fields set up and exist*/
+    bool layerCanFreeze( const QgsMapLayer* ml, int& xCol, int& yCol ) const;
 
   protected:
     QgsRubberBand* mLabelRubberBand;

diff --git a/src/core/qgslabelsearchtree.cpp b/src/core/qgslabelsearchtree.cpp
@@ -51,7 +51,23 @@ void QgsLabelSearchTree::label( const QgsPoint& p, QList<QgsLabelPosition*>& pos
   }
 }
 
-bool QgsLabelSearchTree::insertLabel( LabelPosition* labelPos, int featureId, const QString& layerName, bool diagram )
+void QgsLabelSearchTree::labelsInRect( const QgsRectangle& r, QList<QgsLabelPosition*>& posList )
+{
+  double c_min[2]; c_min[0] = r.xMinimum(); c_min[1] = r.yMinimum();
+  double c_max[2]; c_max[0] = r.xMaximum(); c_max[1] = r.yMaximum();
+
+  QList<QgsLabelPosition*> searchResults;
+  mSpatialIndex.Search( c_min, c_max, searchCallback, &searchResults );
+
+  posList.clear();
+  QList<QgsLabelPosition*>::const_iterator resultIt = searchResults.constBegin();
+  for ( ; resultIt != searchResults.constEnd(); ++resultIt )
+  {
+    posList.push_back( *resultIt );
+  }
+}
+
+bool QgsLabelSearchTree::insertLabel( LabelPosition* labelPos, int featureId, const QString& layerName, bool diagram, bool frozen )
 {
   if ( !labelPos )
   {
@@ -68,7 +84,7 @@ bool QgsLabelSearchTree::insertLabel( LabelPosition* labelPos, int featureId, co
     cornerPoints.push_back( QgsPoint( labelPos->getX( i ), labelPos->getY( i ) ) );
   }
   QgsLabelPosition* newEntry = new QgsLabelPosition( featureId, labelPos->getAlpha(), cornerPoints, QgsRectangle( c_min[0], c_min[1], c_max[0], c_max[1] ),
-      labelPos->getWidth(), labelPos->getHeight(), layerName, labelPos->getUpsideDown(), diagram );
+      labelPos->getWidth(), labelPos->getHeight(), layerName, labelPos->getUpsideDown(), diagram, frozen );
   mSpatialIndex.Insert( c_min, c_max, newEntry );
   return true;
 }

diff --git a/src/core/qgslabelsearchtree.h b/src/core/qgslabelsearchtree.h
@@ -42,9 +42,12 @@ class CORE_EXPORT QgsLabelSearchTree
     /**Returns label position(s) at a given point. QgsLabelSearchTree keeps ownership, don't delete the LabelPositions*/
     void label( const QgsPoint& p, QList<QgsLabelPosition*>& posList );
 
+    /**Returns label position(s) in given rectangle. QgsLabelSearchTree keeps ownership, don't delete the LabelPositions*/
+    void labelsInRect( const QgsRectangle& r, QList<QgsLabelPosition*>& posList );
+
     /**Inserts label position. Does not take ownership of labelPos
       @return true in case of success*/
-    bool insertLabel( LabelPosition* labelPos, int featureId, const QString& layerName, bool diagram = false );
+    bool insertLabel( LabelPosition* labelPos, int featureId, const QString& layerName, bool diagram = false, bool frozen = false );
 
   private:
     RTree<QgsLabelPosition*, double, 2, double> mSpatialIndex;

diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -43,9 +43,9 @@ struct QgsDiagramLayerSettings;
 
 struct CORE_EXPORT QgsLabelPosition
 {
-  QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, bool upside_down, bool diagram = false ):
-      featureId( id ), rotation( r ), cornerPoints( corners ), labelRect( rect ), width( w ), height( h ), layerID( layer ), upsideDown( upside_down ), isDiagram( diagram ) {}
-  QgsLabelPosition(): featureId( -1 ), rotation( 0 ), labelRect( QgsRectangle() ), width( 0 ), height( 0 ), layerID( "" ), upsideDown( false ), isDiagram( false ) {}
+  QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, bool upside_down, bool diagram = false, bool frozen = false ):
+      featureId( id ), rotation( r ), cornerPoints( corners ), labelRect( rect ), width( w ), height( h ), layerID( layer ), upsideDown( upside_down ), isDiagram( diagram ), isFrozen( frozen ) {}
+  QgsLabelPosition(): featureId( -1 ), rotation( 0 ), labelRect( QgsRectangle() ), width( 0 ), height( 0 ), layerID( "" ), upsideDown( false ), isDiagram( false ), isFrozen( false ) {}
   int featureId;
   double rotation;
   QVector< QgsPoint > cornerPoints;
@@ -55,6 +55,7 @@ struct CORE_EXPORT QgsLabelPosition
   QString layerID;
   bool upsideDown;
   bool isDiagram;
+  bool isFrozen;
 };
 
 /** Labeling engine interface.

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -62,6 +62,7 @@ class QgsPalGeometry : public PalGeometry
         , mId( id )
         , mInfo( NULL )
         , mIsDiagram( false )
+        , mIsFrozen( false )
     {
       mStrId = FID_TO_STRING( id ).toAscii();
     }
@@ -112,6 +113,9 @@ class QgsPalGeometry : public PalGeometry
     void setIsDiagram( bool d ) { mIsDiagram = d; }
     bool isDiagram() const { return mIsDiagram; }
 
+    void setIsFrozen( bool f ) { mIsFrozen = f; }
+    bool isFrozen() const { return mIsFrozen; }
+
     void addDiagramAttribute( int index, QVariant value ) { mDiagramAttributes.insert( index, value ); }
     const QgsAttributeMap& diagramAttributes() { return mDiagramAttributes; }
 
@@ -122,6 +126,7 @@ class QgsPalGeometry : public PalGeometry
     QgsFeatureId mId;
     LabelInfo* mInfo;
     bool mIsDiagram;
+    bool mIsFrozen;
     /**Stores attribute values for data defined properties*/
     QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant > mDataDefinedValues;
 
@@ -706,6 +711,9 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   {
     lbl->addDataDefinedValue( dIt.key(), f.attributeMap()[dIt.value()] );
   }
+
+  // set geometry's frozen property
+  lbl->setIsFrozen( dataDefinedPosition );
 }
 
 int QgsPalLayerSettings::sizeToPixel( double size, const QgsRenderContext& c ) const
@@ -1141,7 +1149,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
         //for diagrams, remove the additional 'd' at the end of the layer id
         QString layerId = layerNameUtf8;
         layerId.chop( 1 );
-        mLabelSearchTree->insertLabel( *it,  QString( palGeometry->strId() ).toInt(), layerId, true );
+        mLabelSearchTree->insertLabel( *it,  QString( palGeometry->strId() ).toInt(), layerId, true, false );
       }
       continue;
     }
@@ -1224,7 +1232,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
 
     if ( mLabelSearchTree )
     {
-      mLabelSearchTree->insertLabel( *it,  QString( palGeometry->strId() ).toInt(), ( *it )->getLayerName() );
+      mLabelSearchTree->insertLabel( *it,  QString( palGeometry->strId() ).toInt(), ( *it )->getLayerName(), false, palGeometry->isFrozen() );
     }
   }
 
@@ -1274,6 +1282,24 @@ QList<QgsLabelPosition> QgsPalLabeling::labelsAtPosition( const QgsPoint& p )
   return positions;
 }
 
+QList<QgsLabelPosition> QgsPalLabeling::labelsWithinRect( const QgsRectangle& r )
+{
+  QList<QgsLabelPosition> positions;
+
+  QList<QgsLabelPosition*> positionPointers;
+  if ( mLabelSearchTree )
+  {
+    mLabelSearchTree->labelsInRect( r, positionPointers );
+    QList<QgsLabelPosition*>::const_iterator pointerIt = positionPointers.constBegin();
+    for ( ; pointerIt != positionPointers.constEnd(); ++pointerIt )
+    {
+      positions.push_back( QgsLabelPosition( **pointerIt ) );
+    }
+  }
+
+  return positions;
+}
+
 void QgsPalLabeling::numCandidatePositions( int& candPoint, int& candLine, int& candPolygon )
 {
   candPoint = mCandPoint;

diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
@@ -48,6 +48,7 @@ class QgsMapToPixel;
 class QgsFeature;
 
 #include "qgspoint.h"
+#include "qgsrectangle.h"
 #include "qgsmaprenderer.h" // definition of QgsLabelingEngineInterface
 #include "qgsexpression.h"
 
@@ -224,6 +225,8 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
     virtual void exit();
     //! return infos about labels at a given (map) position
     virtual QList<QgsLabelPosition> labelsAtPosition( const QgsPoint& p );
+    //! return infos about labels within a given (map) rectangle
+    virtual QList<QgsLabelPosition> labelsWithinRect( const QgsRectangle& r );
 
     //! called when passing engine among map renderers
     virtual QgsLabelingEngineInterface* clone();

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -394,6 +394,8 @@
     <bool>false</bool>
    </attribute>
    <addaction name="mActionLabeling"/>
+   <addaction name="mActionShowFrozenLabels"/>
+   <addaction name="mActionFreezeLabels"/>
    <addaction name="mActionMoveLabel"/>
    <addaction name="mActionRotateLabel"/>
    <addaction name="mActionChangeLabelProperties"/>
@@ -1698,6 +1700,41 @@
     <string>Creates a scale bar that is displayed on the map canvas</string>
    </property>
   </action>
+  <action name="mActionFreezeLabels">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionFreezeLabels.png</normaloff>:/images/themes/default/mActionFreezeLabels.png</iconset>
+   </property>
+   <property name="text">
+    <string>Freeze or Thaw Labels</string>
+   </property>
+   <property name="whatsThis">
+    <string>Freeze (write label location and optionally rotation) to attribute table.
+
+Click on individual labels, or draw a marquee (labels touching will be included). Actions on in-memory attribute table fields are immediate.
+
+Hold Shift key down to Thaw (write NULLs to attribute table), reverting label to dynamic.
+Hold Alt key down to toggle selected labels between Frozen and Thawed states.</string>
+   </property>
+  </action>
+  <action name="mActionShowFrozenLabels">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionShowFrozenLabels.png</normaloff>:/images/themes/default/mActionShowFrozenLabels.png</iconset>
+   </property>
+   <property name="text">
+    <string>Show Frozen Labels</string>
+   </property>
+   <property name="toolTip">
+    <string>Show Frozen Labels</string>
+   </property>
+  </action>
   <action name="mActionNewBlankProject">
    <property name="icon">
     <iconset resource="../../images/images.qrc">