diff --git a/Makefile b/Makefile
index 2699aee2..79b87dbd 100644
--- a/Makefile
+++ b/Makefile
@@ -138,10 +138,13 @@ perf: $(STANDALONE_TARGET)
 	hotspot perf.data
 	rm perf.data
 
+# VALGRIND_FLAGS += --gen-suppressions=all
+VALGRIND_FLAGS += --suppressions=valgrind.supp
+# VALGRIND_FLAGS += --leak-check=full
+VALGRIND_FLAGS += --track-origins=yes
+VALGRIND_FLAGS += --exit-on-first-error=yes
 valgrind: $(STANDALONE_TARGET)
-	# --gen-suppressions=yes
-	# --leak-check=full
-	valgrind --suppressions=valgrind.supp ./$< -d
+	valgrind $(VALGRIND_FLAGS) ./$< -d
 
 clean:
 	rm -rfv build dist $(TARGET) $(STANDALONE_TARGET) *.a
diff --git a/valgrind.supp b/valgrind.supp
index 116f1a0b..3147bfb5 100644
--- a/valgrind.supp
+++ b/valgrind.supp
@@ -1,54 +1,20 @@
 {
-   <insert_a_suppression_name_here>
-   Memcheck:Addr8
-   ...
-   obj:/usr/lib/dri/i965_dri.so
-   ...
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr4
-   ...
-   obj:/usr/lib/dri/i965_dri.so
-   ...
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr2
-   ...
-   obj:/usr/lib/dri/i965_dri.so
-   ...
-}
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Addr1
-   ...
-   obj:/usr/lib/dri/i965_dri.so
-   ...
-}
-
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
-   ...
-   obj:/usr/lib/libasound.so.2.0.0
+   <PulseAudio>
+   Memcheck:Cond
    ...
+   fun:pa_mainloop_run
 }
 {
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: definite
+   <Mesa>
+   Memcheck:Cond
    ...
-   obj:/usr/lib/libgtk-x11-2.0.so.0.2400.32
+   obj:/usr/lib/libgallium*
    ...
 }
 {
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   match-leak-kinds: possible
+   <Mesa>
+   Memcheck:Cond
    ...
-   obj:/usr/lib/libgobject-2.0.so.0.5800.3
+   obj:/usr/lib/libGLX_mesa*
    ...
 }
\ No newline at end of file