diff --git a/cmm/Makefile.in b/cmm/Makefile.in
index 6349d1f..1690a5c 100644
--- a/cmm/Makefile.in
+++ b/cmm/Makefile.in
@@ -403,7 +403,8 @@
 	      || exit 1; \
 	  fi; \
 	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
diff --git a/cmm/src/Makefile.am b/cmm/src/Makefile.am
index 7ee3f55..9cc1790 100644
--- a/cmm/src/Makefile.am
+++ b/cmm/src/Makefile.am
@@ -31,6 +31,7 @@
 		module_qm.c  \
 		module_prf.c \
 		module_vlan.c \
+		module_l2tp.c \
 		module_macvlan.c \
 		module_mcast.c \
 		module_mc6.c \
@@ -53,10 +54,12 @@
 		third_part.c \
 		cmm_asym_ff.c
 
-cmm_LDADD = -lpthread -lfci -lcli -lcmm -lpcap @CMM_LIBS@
+cmm_LDADD = -lpthread -lfci -lcli libcmm.la -lpcap @CMM_LIBS@
+cmm_DEPENDENCIES = libcmm.la
 
 libcmm_sample_SOURCES = libcmm_sample.c
-libcmm_sample_LDADD = -lcmm
+libcmm_sample_LDADD = libcmm.la
+libcmm_sample_DEPENDENCIES = libcmm.la
 
 lib_LTLIBRARIES = libcmm.la
 libcmm_la_SOURCES = libcmm.c
diff --git a/cmm/src/Makefile.in b/cmm/src/Makefile.in
index 09d0125..836893c 100644
--- a/cmm/src/Makefile.in
+++ b/cmm/src/Makefile.in
@@ -65,21 +65,19 @@
 	forward_engine.$(OBJEXT) route_cache.$(OBJEXT) pppoe.$(OBJEXT) \
 	ffbridge.$(OBJEXT) client_daemon.$(OBJEXT) rtnl.$(OBJEXT) \
 	module_rx.$(OBJEXT) module_qm.$(OBJEXT) module_prf.$(OBJEXT) \
-	module_vlan.$(OBJEXT) module_macvlan.$(OBJEXT) \
-	module_mcast.$(OBJEXT) module_mc6.$(OBJEXT) \
-	module_mc4.$(OBJEXT) keytrack.$(OBJEXT) timeout.$(OBJEXT) \
-	module_tunnel.$(OBJEXT) module_relay.$(OBJEXT) itf.$(OBJEXT) \
-	module_stat.$(OBJEXT) module_route.$(OBJEXT) \
-	module_socket.$(OBJEXT) module_rtp.$(OBJEXT) \
-	module_natpt.$(OBJEXT) module_wifi.$(OBJEXT) \
-	alt_conf.$(OBJEXT) voicebuf.$(OBJEXT) module_pktcap.$(OBJEXT) \
-	module_icc.$(OBJEXT) third_part.$(OBJEXT) cmm_asym_ff.$(OBJEXT) \
-	module_l2tp.$(OBJEXT)
+	module_vlan.$(OBJEXT) module_l2tp.$(OBJEXT) \
+	module_macvlan.$(OBJEXT) module_mcast.$(OBJEXT) \
+	module_mc6.$(OBJEXT) module_mc4.$(OBJEXT) keytrack.$(OBJEXT) \
+	timeout.$(OBJEXT) module_tunnel.$(OBJEXT) \
+	module_relay.$(OBJEXT) itf.$(OBJEXT) module_stat.$(OBJEXT) \
+	module_route.$(OBJEXT) module_socket.$(OBJEXT) \
+	module_rtp.$(OBJEXT) module_natpt.$(OBJEXT) \
+	module_wifi.$(OBJEXT) alt_conf.$(OBJEXT) voicebuf.$(OBJEXT) \
+	module_pktcap.$(OBJEXT) module_icc.$(OBJEXT) \
+	third_part.$(OBJEXT) cmm_asym_ff.$(OBJEXT)
 cmm_OBJECTS = $(am_cmm_OBJECTS)
-cmm_DEPENDENCIES =
 am_libcmm_sample_OBJECTS = libcmm_sample.$(OBJEXT)
 libcmm_sample_OBJECTS = $(am_libcmm_sample_OBJECTS)
-libcmm_sample_DEPENDENCIES =
 DEFAULT_INCLUDES = -I. -I$(srcdir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -212,7 +210,6 @@
 cmm_SOURCES = neighbor_resolution.c  \
 		module_expt.c  \
 		cmm.c  \
-		cmm_asym_ff.c  \
 		conntrack.c  \
 		ffcontrol.c  \
 		forward_engine.c  \
@@ -225,6 +222,7 @@
 		module_qm.c  \
 		module_prf.c \
 		module_vlan.c \
+		module_l2tp.c \
 		module_macvlan.c \
 		module_mcast.c \
 		module_mc6.c \
@@ -245,11 +243,13 @@
 		module_pktcap.c \
 		module_icc.c \
 		third_part.c \
-		module_l2tp.c
+		cmm_asym_ff.c
 
-cmm_LDADD = -lpthread -lfci -lcli -lcmm -lpcap @CMM_LIBS@
+cmm_LDADD = -lpthread -lfci -lcli libcmm.la -lpcap @CMM_LIBS@
+cmm_DEPENDENCIES = libcmm.la
 libcmm_sample_SOURCES = libcmm_sample.c
-libcmm_sample_LDADD = -lcmm
+libcmm_sample_LDADD = libcmm.la
+libcmm_sample_DEPENDENCIES = libcmm.la
 lib_LTLIBRARIES = libcmm.la
 libcmm_la_SOURCES = libcmm.c
 all: $(BUILT_SOURCES)
@@ -370,6 +370,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcmm_sample.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_expt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_icc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_l2tp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_macvlan.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_mc4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module_mc6.Po@am__quote@