diff --git a/Ponca/src/Fitting/basket.h b/Ponca/src/Fitting/basket.h
index 453709f1c..3f309eb7b 100644
--- a/Ponca/src/Fitting/basket.h
+++ b/Ponca/src/Fitting/basket.h
@@ -69,6 +69,20 @@ namespace internal
     struct BasketDiffAggregate : BasketDiffAggregateImpl<BasketType, Type, BasketType, PrimitiveDer, Exts...>
     {
     };
+
+    /*! \brief Internal class used to build the BasketAutoDiff structure */
+    template <class P, class W, int Type,
+        template <class, class, typename> class Ext0,
+        template <class, class, typename> class... Exts>
+    struct BasketAutoDiffAggregate
+    {
+    private:
+        using Base = Ext0<P, W, PrimitiveBase<P, W>>;
+        using Aggregate = typename BasketAggregateImpl<P, W, Base, Exts...>::type; // Same impl
+
+    public:
+        using type = typename Base::template DDerType<P, W, Type, PrimitiveDer<P, W, Type, Aggregate>>;
+    };
 }
 #endif
 
@@ -241,5 +255,12 @@ namespace internal
         }
     }; // class Basket
 
+    template <class P, class W, int Type,
+        template <class, class, int, typename> class Ext0,
+        template <class, class, int, typename> class... Exts>
+    class BasketAutoDiff : public internal::BasketAutoDiffAggregate<P, W, Type, Ext0, Exts...>::type
+    {
+    }; // class BasketAutoDiff
+
 } //namespace Ponca
 
diff --git a/tests/src/basket.cpp b/tests/src/basket.cpp
index f89d87b04..85601a658 100644
--- a/tests/src/basket.cpp
+++ b/tests/src/basket.cpp
@@ -193,6 +193,14 @@ void hasSamePlaneDerivatives(const Fit1& fit1, const Fit2& fit2) {
     VERIFY(dnor1.isApprox( dnor2 ));
 }
 
+// For BasketAutoDiff
+template <class P, class W, typename T>
+struct AutoDiffExt : public T
+{
+    template <class D, class W_, int Di, typename TT>
+    using DDerType = OrientedSphereDerImpl<D, W_, Di, TT>;
+};
+
 template<typename Scalar, int Dim>
 void callSubTests()
 {
@@ -230,6 +238,10 @@ void callSubTests()
     using HybridSpaceDiff = BasketDiff<Hybrid, FitSpaceDer, CovariancePlaneDer>;
     using HybridScaleSpaceDiff = BasketDiff<Hybrid, FitScaleSpaceDer, CovariancePlaneDer>;
 
+    //! [BasketAutoDiff]
+    using AutoDiff = BasketAutoDiff<Point, WeightFunc, FitScaleDer, AutoDiffExt>;
+    //! [BasketAutoDiff]
+
     KdTree<Point>tree;
     Scalar scale = generateData(tree);