We propose a flexible and efficient wavelet construction for non-uniform B-spline curves and surfaces. The method allows to remove knots in arbitrary order minimizing the displacement of control points when a knot is re-inserted. Geometric detail subtracted from a shape by knot removal is represented by an associated wavelet coefficient replacing one of the control points at a coarser level of detail. From the hierarchy of wavelet coefficients, perfect reconstruction of the original shape is obtained. Both knot removal and insertion have local impact. Wavelet synthesis and analysis are both computed in linear time, based on the lifting scheme for biorthogonal wavelets. The method is perfectly suited for multiresolution surface editing, progressive transmission, and compression of spline curves and surfaces.