diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip
index 3cf83eb1439d..d4ec8ab67e93 100644
--- a/python/core/qgsrendercontext.sip
+++ b/python/core/qgsrendercontext.sip
@@ -47,6 +47,8 @@ class QgsRenderContext
   void setRasterScaleFactor(double factor);
   void setRendererScale( double scale );
   void setPainter(QPainter* p);
+  //! Added in QGIS v1.5
+  void setForceVectorOutput( bool force );
   //! Added in QGIS v1.4
   void setLabelingEngine(QgsLabelingEngineInterface* iface);
 };
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
index 4f7b18d36a53..32e8954e9ab9 100644
--- a/src/core/composer/qgscomposermap.cpp
+++ b/src/core/composer/qgscomposermap.cpp
@@ -142,6 +142,9 @@ void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const
     theRendererContext->setRenderingStopped( false );
   }
 
+  // force vector output (no caching of marker images etc.)
+  theRendererContext->setForceVectorOutput( true );
+
   //force composer map scale for scale dependent visibility
   double bk_scale = theMapRenderer.scale();
   theMapRenderer.setScale( scale() );
diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp
index 83dc3a5b9c06..24374e16221a 100644
--- a/src/core/qgsrendercontext.cpp
+++ b/src/core/qgsrendercontext.cpp
@@ -22,7 +22,7 @@ QgsRenderContext::QgsRenderContext()
     : mPainter( 0 ),
     mCoordTransform( 0 ),
     mDrawEditingInformation( false ),
-    mForceVectorOutput( true ),
+    mForceVectorOutput( false ),
     mRenderingStopped( false ),
     mScaleFactor( 1.0 ),
     mRasterScaleFactor( 1.0 ),
diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h
index c041a0a4eb73..2682dbc4bfec 100644
--- a/src/core/qgsrendercontext.h
+++ b/src/core/qgsrendercontext.h
@@ -75,6 +75,8 @@ class CORE_EXPORT QgsRenderContext
     void setRasterScaleFactor( double factor ) {mRasterScaleFactor = factor;}
     void setRendererScale( double scale ) {mRendererScale = scale;}
     void setPainter( QPainter* p ) {mPainter = p;}
+    //! Added in QGIS v1.5
+    void setForceVectorOutput( bool force ) {mForceVectorOutput = force;}
     //! Added in QGIS v1.4
     void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = iface; }