diff -u src/META src2/META
--- src/META	2004-12-21 21:15:14.000000000 +0200
+++ src2/META	2007-04-16 18:05:11.000000000 +0300
@@ -2,6 +2,6 @@
 version = "0.5.0"
 description = "OCaml wrapper for libevent"
 requires = "unix"
-archive(byte) = "libevent.cma"
-archive(native) = "libevent.cmxa"
-linkopts = ""
+archive(byte) = "libmlevent.cma"
+archive(native) = "libmlevent.cmxa"
+linkopts = "-cclib -levent"
diff -u src/Makefile src2/Makefile
--- src/Makefile	2004-12-21 21:15:14.000000000 +0200
+++ src2/Makefile	2007-04-16 18:24:00.000000000 +0300
@@ -7,14 +7,15 @@
 EVENT_LIBDIR=/usr/local/lib
 EVENT_INCDIR=/usr/local/include
 
-NAME=libevent
+LIBNAME=libevent
+NAME=libmlevent
 OBJECTS=libevent.cmo
 XOBJECTS=$(OBJECTS:.cmo=.cmx)
 C_OBJECTS=event_stubs.o
 
-ARCHIVE=$(NAME).cma
+ARCHIVE=libmlevent.cma
 XARCHIVE=$(ARCHIVE:.cma=.cmxa)
-CARCHIVE_NAME=mlevent
+CARCHIVE_NAME=mlevent-c
 CARCHIVE=lib$(CARCHIVE_NAME).a
 
 # Flags for the C compiler.
@@ -39,24 +40,24 @@
 ## Library creation
 $(CARCHIVE): $(C_OBJECTS)
 	$(OCAMLMKLIB) -oc $(CARCHIVE_NAME) $(C_OBJECTS) \
-	-L$(EVENT_LIBDIR) $(EVENT_LIB)
+	-L$(EVENT_LIBDIR) -linkall $(EVENT_LIB)
 $(ARCHIVE): $(CARCHIVE) $(OBJECTS)
 	$(OCAMLMKLIB) -o $(NAME) $(OBJECTS) -oc $(CARCHIVE_NAME) \
-	-L$(EVENT_LIBDIR) $(EVENT_LIB)
+	-L$(EVENT_LIBDIR) -linkall $(EVENT_LIB)
 $(XARCHIVE): $(CARCHIVE) $(XOBJECTS)
 	$(OCAMLMKLIB) -o $(NAME) $(XOBJECTS) -oc $(CARCHIVE_NAME) \
-	-L$(EVENT_LIBDIR) $(EVENT_LIB)
+	-L$(EVENT_LIBDIR) -linkall $(EVENT_LIB)
 
 ## Installation
 .PHONY: install
 install: all
 	{ test ! -f $(XARCHIVE) || extra="$(XARCHIVE) $(NAME).a"; }; \
-	$(OCAMLFIND) install $(NAME) META $(NAME).cmi $(NAME).mli $(ARCHIVE) \
-	dll$(CARCHIVE_NAME).so lib$(CARCHIVE_NAME).a $$extra
+	$(OCAMLFIND) install $(LIBNAME) META libevent.cmi libevent.mli $(ARCHIVE) \
+	lib$(CARCHIVE_NAME).a $$extra dllmlevent-c.so
 
 .PHONY: uninstall
 uninstall:
-	$(OCAMLFIND) remove $(NAME)
+	$(OCAMLFIND) remove $(LIBNAME)
 
 ## Documentation
 .PHONY: doc
Only in src2: Makefile~
Common subdirectories: src/doc and src2/doc
Common subdirectories: src/examples and src2/examples