diff --git a/Makefile b/Makefile
index 686049b..9a926a9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ INCDIR=include
 
 CXX=cl /nologo
 LD=link /nologo
-CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /Zi /DWIN32_LEAN_AND_MEAN /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DUNICODE /D_UNICODE
-LDFLAGS=/subsystem:windows /debug /incremental:no /opt:REF
+CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /DWIN32_LEAN_AND_MEAN /DWINVER=0x0601 /D_WIN32_WINNT=0x0601 /DUNICODE /D_UNICODE
+LDFLAGS=/subsystem:windows /incremental:no /opt:REF
 RC=rc /nologo
 RCFLAGS=/i$(INCDIR)
 LIBS=
@@ -18,6 +18,11 @@ BUILD=Release
 LDFLAGS=$(LDFLAGS)
 !ENDIF
 
+!IFNDEF NOPDB
+CXXFLAGS=$(CXXFLAGS) /Zi
+LDFLAGS=$(LDFLAGS) /debug
+!ENDIF
+
 OUTDIR=build\$(BUILD)
 DISTDIR=dist\$(BUILD)
 FILES=$(OUTDIR)\Keyboard.obj \