diff --git a/docs/changes.txt b/docs/changes.txt
index 4ef897f19..1d85e57a0 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -36,6 +36,7 @@
 ##
 
 - Building: Added hashcat32.dll and hashcat64.dll makefile targets for building hashcat windows libraries
+- Building: Added production flag in Makefile to disable all the GCC compiler options needed only for development
 - Building: Removed access to readlink() on FreeBSD
 - Events: Added new event EVENT_WEAK_HASH_ALL_CRACKED if all hashes have been cracked during weak hash check
 - Hardware management: Switched matching ADL device with OpenCL device by using PCI bus, device and function
diff --git a/src/Makefile b/src/Makefile
index 1fe6359de..643064efb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -111,11 +111,16 @@ COMPTIME                := $(shell date +%s)
 VERSION_EXPORT          := $Format:%D$
 VERSION_TAG             := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|$(SED) -r 's|.* (\w+/)?([^ ]+)|\2|')
 
+PRODUCTION              := 1
+
 ##
 ## General compiler and linker options
 ##
 
 CFLAGS                  += -pipe -std=c99 -Iinclude/ -IOpenCL/
+CFLAGS                  += -Wno-format-zero-length
+
+ifeq ($(PRODUCTION),0)
 CFLAGS                  += -W
 CFLAGS                  += -Wall
 CFLAGS                  += -Wextra
@@ -132,7 +137,6 @@ CFLAGS                  += -Wunreachable-code
 CFLAGS                  += -Winit-self
 CFLAGS                  += -Werror-implicit-function-declaration
 CFLAGS                  += -Wformat
-CFLAGS                  += -Wno-format-zero-length
 CFLAGS                  += -ftrapv
 
 # the following compiler options produce warnings that should be fixed at some time
@@ -143,6 +147,7 @@ CFLAGS                  += -ftrapv
 #CFLAGS                  += -Wsign-conversion
 #CFLAGS                  += -Wwrite-strings
 #CFLAGS                  += -pedantic
+endif
 
 # default linux and freebsd thread stack size is 2MB
 # default windows thread stack size is 1MB