Apparatus for decoding a predetermined block of a picture using intra-prediction, configured to decode a set-selective syntax element from the data stream which indicates whether the predetermined block is to be predicted using an intra-prediction mode of a first set of intra-prediction modes, the first set comprising a DC intra prediction mode and angular prediction modes, wherein the predetermined block is a luma block, if the set-selective syntax element indicates that the predetermined block is to be predicted using one of the first set of intra-prediction modes, form a list of most probable intra-prediction modes comprising intra-prediction modes used to predict neighbouring blocks (524, 526) of the predetermined block, wherein when any one of the neighbouring blocks (524, 526) is predicted by any of the angular intra prediction modes, the list does not include the DC intra prediction mode; derive a MPM list index from the data stream which points into the list of most probable intra-prediction modes onto a predetermined intra-prediction mode, intra-predicting the predetermined block using the predetermined intra-prediction mode, if the set-selective syntax element indicates that the predetermined block is not to be predicted using one of the first set of intra-prediction modes, derive a further index (540; 546) from the data stream which indicates a predetermined matrix-based intra-prediction mode out of a second set of matrix-based intra-prediction modes by compute a matrix-vector product between a vector (514, 400, 402) derived from reference samples in a neighbourhood of the predetermined block and a predetermined prediction matrix associated with the predetermined matrix-based intra-prediction mode so as to obtain a prediction vector, and predict samples of the predetermined block on the basis of the prediction vector. decode a set-selective syntax element from the data stream which indicates whether the predetermined block is to be predicted using an intra-prediction mode of a first set of intra-prediction modes, the first set comprising a DC intra prediction mode and angular prediction modes, wherein the predetermined block is a luma block, if the set-selective syntax element indicates that the predetermined block is to be predicted using one of the first set of intra-prediction modes, form a list of most probable intra-prediction modes comprising intra-prediction modes used to predict neighbouring blocks (524, 526) of the predetermined block, wherein when any one of the neighbouring blocks (524, 526) is predicted by any of the angular intra prediction modes, the list does not include the DC intra prediction mode; derive a MPM list index from the data stream which points into the list of most probable intra-prediction modes onto a predetermined intra-prediction mode, intra-predicting the predetermined block using the predetermined intra-prediction mode, form a list of most probable intra-prediction modes comprising intra-prediction modes used to predict neighbouring blocks (524, 526) of the predetermined block, wherein when any one of the neighbouring blocks (524, 526) is predicted by any of the angular intra prediction modes, the list does not include the DC intra prediction mode; derive a MPM list index from the data stream which points into the list of most probable intra-prediction modes onto a predetermined intra-prediction mode, intra-predicting the predetermined block using the predetermined intra-prediction mode, if the set-selective syntax element indicates that the predetermined block is not to be predicted using one of the first set of intra-prediction modes, derive a further index (540; 546) from the data stream which indicates a predetermined matrix-based intra-prediction mode out of a second set of matrix-based intra-prediction modes by compute a matrix-vector product between a vector (514, 400, 402) derived from reference samples in a neighbourhood of the predetermined block and a predetermined prediction matrix associated with the predetermined matrix-based intra-prediction mode so as to obtain a prediction vector, and predict samples of the predetermined block on the basis of the prediction vector. derive a further index (540; 546) from the data stream which indicates a predetermined matrix-based intra-prediction mode out of a second set of matrix-based intra-prediction modes by compute a matrix-vector product between a vector (514, 400, 402) derived from reference samples in a neighbourhood of the predetermined block and a predetermined prediction matrix associated with the predetermined matrix-based intra-prediction mode so as to obtain a prediction vector, and predict samples of the predetermined block on the basis of the prediction vector.