diff --git a/tools/hitag2crack/crack2/Makefile b/tools/hitag2crack/crack2/Makefile
index 55c6a5bd9..4794d6ec4 100644
--- a/tools/hitag2crack/crack2/Makefile
+++ b/tools/hitag2crack/crack2/Makefile
@@ -1,4 +1,4 @@
-CFLAGS?=-Wall
+CFLAGS?=-Wall -Werror -O3
 # Linux libs
 LIBS=-pthread -D_GNU_SOURCE
 # Mac libs
diff --git a/tools/hitag2crack/crack3/Makefile b/tools/hitag2crack/crack3/Makefile
index 80f1ed863..318b5db78 100644
--- a/tools/hitag2crack/crack3/Makefile
+++ b/tools/hitag2crack/crack3/Makefile
@@ -1,4 +1,4 @@
-CFLAGS?=-Wall
+CFLAGS?=-Wall -Werror -O3
 LIBS=
 VPATH=../common
 INC=-I ../common
diff --git a/tools/hitag2crack/crack4/Makefile b/tools/hitag2crack/crack4/Makefile
index 418fb9930..b560577bd 100644
--- a/tools/hitag2crack/crack4/Makefile
+++ b/tools/hitag2crack/crack4/Makefile
@@ -1,4 +1,4 @@
-CFLAGS?=-Wall
+CFLAGS?=-Wall -Werror -O3
 LIBS=-lpthread
 VPATH=../common
 INC=-I ../common
diff --git a/tools/hitag2crack/crack5/Makefile b/tools/hitag2crack/crack5/Makefile
index 6ddc0150f..9d19b63ee 100644
--- a/tools/hitag2crack/crack5/Makefile
+++ b/tools/hitag2crack/crack5/Makefile
@@ -1,4 +1,4 @@
-CFLAGS?=-Wall
+CFLAGS?=-Wall -Werror -O3
 LIBS=-lpthread
 VPATH=../common
 INC=-I ../common