diff --git a/intern/cycles/kernel/shaders/node_mapping.osl b/intern/cycles/kernel/shaders/node_mapping.osl
index 2e720edfc7e..92df043b39d 100644
--- a/intern/cycles/kernel/shaders/node_mapping.osl
+++ b/intern/cycles/kernel/shaders/node_mapping.osl
@@ -20,9 +20,17 @@
 
 shader node_mapping(
 	matrix Matrix = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+	point mapping_min = point(0.0, 0.0, 0.0),
+	point mapping_max = point(0.0, 0.0, 0.0),
+	int use_minmax = 0,
 	point VectorIn = point(0.0, 0.0, 0.0),
 	output point VectorOut = point(0.0, 0.0, 0.0))
 {
-	VectorOut = transform(Matrix, VectorIn);
+	point p = transform(Matrix, VectorIn);
+
+	if(use_minmax)
+		p = min(max(mapping_min, p), mapping_max);
+	
+	VectorOut = p;
 }
 
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 55fb9bf8a7e..3f8055b3540 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1098,6 +1098,9 @@ void MappingNode::compile(OSLCompiler& compiler)
 {
 	Transform tfm = transform_transpose(tex_mapping.compute_transform());
 	compiler.parameter("Matrix", tfm);
+	compiler.parameter_point("mapping_min", tex_mapping.min);
+	compiler.parameter_point("mapping_max", tex_mapping.max);
+	compiler.parameter("use_minmax", tex_mapping.use_minmax);
 
 	compiler.add(this, "node_mapping");
 }