-OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_OPTS) -thread
-OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMON_OPTS) -thread
-OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMON_OPTS)
+OCAMLC = $(OCAMLFIND) ocamlc $(COMMON_FLAGS)
+OCAMLOPT = $(OCAMLFIND) ocamlopt $(COMMON_FLAGS)
+OCAMLDEP = $(OCAMLFIND) ocamldep $(COMMON_FLAGS)
+OCAMLDOC := ocamldoc -I $(shell $(OCAMLFIND) query netstring)