diff --git a/src/libafs/MakefileProto.OBSD.in b/src/libafs/MakefileProto.OBSD.in
index c21ea10fc6..4e53af0ba0 100644
--- a/src/libafs/MakefileProto.OBSD.in
+++ b/src/libafs/MakefileProto.OBSD.in
@@ -12,14 +12,20 @@ include @TOP_OBJDIR@/src/config/Makefile.config
 
 # System specific build commands and flags
 KSRC = /usr/src/sys
-KDEFS=-Wall -nostdinc -I/usr/include \
-	-DLKM -DDIAGNOSTIC -DFIFO -DNFSCLIENT -DMFS -DFFS -D_KERNEL -DI586_CPU -DI686_CPU \
-	-I${KSRC}/sys
-DBUG = -O2
+KFLAGS= -Wall -nostdinc
+<i386_obsd33>
+KFLAGS+= -fno-stack-protector
+<all>
+KDEFS= \
+    ${KFLAGS} \
+    -I/usr/include -I${KSRC}/sys \
+    -DLKM -DDIAGNOSTIC -DFIFO -DNFSCLIENT -DMFS -DFFS -D_KERNEL -DI586_CPU \
+    -DI686_CPU
+DBUG=
 DEFINES= -DAFSDEBUG -DKERNEL -DAFS -DVICE -DNFS -DUFS -DINET -DQUOTA -DGETMOUNT
 OPTF= ${OPT}
 OPTF2= ${OPT2}
-CFLAGS= ${FSINCLUDES} $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG}
+CFLAGS= ${FSINCLUDES} ${DEFINES} ${KDEFS} ${KOPTS} ${DBUG}
 
 # Name of directory to hold object files and libraries.
 KOBJ = MODLOAD