Serpulidae Rafinesque, 1815 is a speciose group of polychaetes that all inhabit calcareous tubes. The family was traditionally subdivided into Serpulinae, Filograninae, and Spirorbinae. Recent phylogenetic analyses have suggested that both Filograninae and Serpulinae are paraphyletic, though with limited sampling. Here we report the first phylogenetic analysis of Serpulidae based on comprehensive sampling of genera (though excluding most spirorbin genera). We include a much-needed revision of serpulid taxonomy based on a phylogenetic hypothesis derived from both morphological and molecular data. We analysed 18S, 28S, histone H3 ribosomal nuclear DNA and cytochrome b (cytb) mitochondrial sequences, combined with morphological data. The proposed new classification includes the re-formulated Serpulinae (with tribes Serpulini and Ficopomatini), Spirorbinae, and Filograninae, with apomorphies highlighted for major taxa.