Genotyping-by-sequencing (GBS) has recently emerged as a promising genomic approach for exploring plant genetic diversity on a genome-wide scale. However, many uncertainties and challenges remain in the application of GBS, particularly in non-model species. Here, we present a GBS protocol we developed and use for plant genetic diversity analysis. It uses two restriction enzymes to reduce genome complexity, applies Illumina multiplexing indexes for barcoding and has a custom bioinformatics pipeline for genotyping. This genetic diversity-focused GBS (gd-GBS) protocol can serve as an easy-to-follow lab guide to assist a researcher through every step of a GBS application with five main components: sample preparation, library assembly, sequencing, SNP calling and diversity analysis. Specifically, in this presentation, we provide a brief overview of the GBS approach, describe the gd-GBS procedures, illustrate it with an application to analyze genetic diversity in 20 flax (Linum usitatissimum L.) accessions and discuss related issues in GBS application. Following these lab bench procedures and using the custom bioinformatics pipeline, one could generate genome-wide SNP genotype data for a conventional genetic diversity analysis of a non-model plant species.