diff --git a/src/angel/Makefile.am b/src/angel/Makefile.am
index 8b4b2f3..adfeb2b 100644
--- a/src/angel/Makefile.am
+++ b/src/angel/Makefile.am
@@ -5,7 +5,6 @@ lib_LTLIBRARIES=liblighttpd2-sharedangel.la
 common_cflags=-I$(top_srcdir)/include -I$(top_builddir)/include
 
 lighttpd_angel_shared_src= \
-	angel_config_parser.c \
 	angel_log.c \
 	angel_plugin.c \
 	angel_plugin_core.c \
@@ -13,14 +12,19 @@ lighttpd_angel_shared_src= \
 	angel_server.c \
 	angel_value.c
 
-BUILT_SOURCES=angel_config_parser.c
+parsers= \
+	angel_config_parser.c
+nodist_lighttpd_angel_shared_src=$(parsers)
+
+BUILT_SOURCES=$(parsers)
+CLEANFILES=$(parsers)
+EXTRA_DIST=angel_config_parser.rl
 
 angel_config_parser.c: angel_config_parser.rl
 	$(RAGEL) -C -T1 -o $@ $<
 
-EXTRA_DIST=angel_config_parser.rl
-
 liblighttpd2_sharedangel_la_SOURCES=$(lighttpd_angel_shared_src)
+nodist_liblighttpd2_sharedangel_la_SOURCES=$(nodist_lighttpd_angel_shared_src)
 liblighttpd2_sharedangel_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS) -DDEFAULT_LIBEXECDIR='"$(libexecdir)"'
 liblighttpd2_sharedangel_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
 liblighttpd2_sharedangel_la_LIBADD=../common/liblighttpd2-common.la
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 3e77710..618730c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,7 +10,6 @@ common_src= \
 	events.c \
 	fetch.c \
 	idlist.c \
-	ip_parsers.c \
 	jobqueue.c \
 	memcached.c \
 	mempool.c \
@@ -22,18 +21,22 @@ common_src= \
 	utils.c \
 	waitqueue.c
 
+parsers=ip_parsers.c
+nodist_common_src=$(parsers)
+
 if WITH_PROFILER
 common_src+= profiler.c
 endif
-EXTRA_liblighttpd2_common_la_SOURCES=$(lua_src) profiler.c
+EXTRA_liblighttpd2_common_la_SOURCES=profiler.c
 
-BUILT_SOURCES=ip_parsers.c
+BUILT_SOURCES=$(parsers)
+CLEANFILES=$(parsers)
+EXTRA_DIST=ip_parsers.rl
 
 ip_parsers.c: ip_parsers.rl
 	$(RAGEL) -C -T1 -o $@ $<
 
-EXTRA_DIST=ip_parsers.rl
-
 liblighttpd2_common_la_SOURCES=$(common_src)
+nodist_liblighttpd2_common_la_SOURCES=$(nodist_common_src)
 liblighttpd2_common_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS)
 liblighttpd2_common_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(CRYPT_LIB)
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index f107a8a..989540c 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -14,7 +14,6 @@ lighttpd_shared_src= \
 	chunk_parser.c \
 	collect.c \
 	condition.c \
-	config_parser.c \
 	connection.c \
 	environment.c \
 	etag.c \
@@ -22,9 +21,6 @@ lighttpd_shared_src= \
 	filter_chunked.c \
 	filter_buffer_on_disk.c \
 	http_headers.c \
-	http_range_parser.c \
-	http_request_parser.c \
-	http_response_parser.c \
 	lighttpd_glue.c \
 	log.c \
 	mimetype.c \
@@ -42,13 +38,20 @@ lighttpd_shared_src= \
 	stream_http_response.c \
 	stream_simple_socket.c \
 	throttle.c \
-	url_parser.c \
 	value.c \
 	virtualrequest.c \
 	worker.c \
 	 \
 	plugin_core.c
 
+parsers= \
+	config_parser.c \
+	http_range_parser.c \
+	http_request_parser.c \
+	http_response_parser.c \
+	url_parser.c
+nodist_lighttpd_shared_src=$(parsers)
+
 lua_src= \
 	actions_lua.c \
 	condition_lua.c \
@@ -72,7 +75,9 @@ if USE_LUA
 lighttpd_shared_src+=$(lua_src)
 endif
 
-BUILT_SOURCES=config_parser.c http_range_parser.c http_request_parser.c http_response_parser.c url_parser.c
+BUILT_SOURCES=$(parsers)
+CLEANFILES=$(parsers)
+EXTRA_DIST=config_parser.rl http_range_parser.rl http_request_parser.rl  http_response_parser.rl url_parser.rl
 
 config_parser.c: config_parser.rl
 	$(RAGEL) -C -T0 -o $@ $<
@@ -85,9 +90,8 @@ http_response_parser.c: http_response_parser.rl
 url_parser.c: url_parser.rl
 	$(RAGEL) -C -T1 -o $@ $<
 
-EXTRA_DIST=config_parser.rl http_range_parser.rl http_request_parser.rl  http_response_parser.rl url_parser.rl
-
 liblighttpd2_shared_la_SOURCES=$(lighttpd_shared_src)
+nodist_liblighttpd2_shared_la_SOURCES=$(nodist_lighttpd_shared_src)
 liblighttpd2_shared_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS) $(LUA_CFLAGS)
 liblighttpd2_shared_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(LUA_LIBS)
 liblighttpd2_shared_la_LIBADD=../common/liblighttpd2-common.la