diff --git a/Makefile b/Makefile
index f77a9faa4..1a2163784 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,5 @@
+CC=gcc
+CFLAGS=-Wall -Wno-pointer-sign -g
+
 parse: parse.c
-	gcc -Wall -g -o parse `xml2-config --cflags` parse.c `xml2-config --libs`
+	$(CC) $(CFLAGS) -o parse `xml2-config --cflags` parse.c `xml2-config --libs`
diff --git a/parse.c b/parse.c
index bbe1a68ca..43bf82d86 100644
--- a/parse.c
+++ b/parse.c
@@ -185,7 +185,7 @@ static void sample_start(void)
 		if (!dive)
 			return;
 	}
-	sample = dive->samples + nr;
+	sample = dive->sample + nr;
 }
 
 static void sample_end(void)