diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc7240bc4..6513b1773 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,6 +212,7 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
 		message("-- OpenCASCADE Community Edition has been found.")
 		add_definitions ( -DHAVE_CONFIG_H )
 		set( OCC_LIBRARIES "TKFeat;TKFillet;TKMesh;TKernel;TKG2d;TKG3d;TKMath;TKIGES;TKSTL;TKShHealing;TKXSBase;TKBool;TKBO;TKBRep;TKTopAlgo;TKGeomAlgo;TKGeomBase;TKOffset;TKPrim;TKSTEP;TKSTEPBase;TKSTEPAttr;TKHLR" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
+		set( OCC_OCAF_LIBRARIES "TKCAF;TKXCAF;TKLCAF;TKXDESTEP;TKXDEIGES" ) #lib list copied from FreeCAD's FindOpenCasCade.cmake
 		set( OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS} )
 		set( OCC_FOUND ${OCE_FOUND} )
 	else() #look for OpenCASCADE
diff --git a/cMake/FindOpenCasCade.cmake b/cMake/FindOpenCasCade.cmake
index 1b04f709d..df0aa010b 100644
--- a/cMake/FindOpenCasCade.cmake
+++ b/cMake/FindOpenCasCade.cmake
@@ -1,12 +1,12 @@
 # Try to find OCC
 # Once done this will define
 #
-# OCC_FOUND        - system has OCC - OpenCASCADE
-# OCC_INCLUDE_DIR  - where the OCC include directory can be found
-# OCC_LIBRARY_DIR  - where the OCC library directory can be found
-# OCC_LIBRARIES    - Link this to use OCC
-#
- 
+# OCC_FOUND          - system has OCC - OpenCASCADE
+# OCC_INCLUDE_DIR    - where the OCC include directory can be found
+# OCC_LIBRARY_DIR    - where the OCC library directory can be found
+# OCC_LIBRARIES      - Link this to use OCC
+# OCC_OCAF_LIBRARIES - Link this to use OCC OCAF framework
+
 
 IF (WIN32)
   IF (CYGWIN OR MINGW)
@@ -80,5 +80,12 @@ IF(OCC_LIBRARY)
     TKHLR
     TKFeat
   )
+  set(OCC_OCAF_LIBRARIES
+    TKCAF
+    TKXCAF
+    TKLCAF
+    TKXDESTEP
+    TKXDEIGES
+  )
 ENDIF(OCC_LIBRARY)
 
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 471cafad6..7939900df 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -2402,6 +2402,7 @@ class _ViewProviderRectangle(_ViewProviderDraft):
         self.Object = vobj.Object
 
     def onChanged(self, vp, prop):
+        from pivy import coin
         if prop == "TextureImage":
             r = vp.RootNode
             if os.path.exists(vp.TextureImage):