diff --git a/ChangeLog b/ChangeLog
index 88d66db..fec2497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
-2005-09-01  Stephen Hemminger  <shemminger@dxpl.pdx.osdl.net>
+2005-09-01   Mike Frysinger <vapier@gentoo.org>
+
+	* Fix build issues with netem tables (parallel make and HOSTCC)
+	
+2005-09-01  Stephen Hemminger  <shemminger@osdl.org>
 
 	* Integrate support for DCCP into 'ss' (from acme)
 	* Add -batch option to ip.
 	* Update to 2.6.14 headers
 
 2005-09-01  Eric Dumazet <dada1@cosmosbay.com>
+	
 	* Fix lnstat : First column should not be summed
 
 2005-08-16  Stephen Hemminger  <shemminger@osdl.org>
diff --git a/netem/Makefile b/netem/Makefile
index 881ed9f..6af5cf1 100644
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -1,17 +1,20 @@
 DISTGEN = maketable normal pareto paretonormal
 DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
 
+HOSTCC ?= $(CC)
 LDLIBS += -lm 
 
-%.dist: %.c
-	$(HOSTCC) $(CFLAGS) -o $* $< -lm
-	./$* >$@
-
-%.dist: %.dat
-	./maketable $< >$@
-
 all: $(DISTGEN) $(DISTDATA)
 
+$(DISTGEN):
+	$(HOSTCC) -Wall -O1 -I../include -o $@ $@.c -lm
+
+%.dist: %
+	./$* > $@
+
+experimental.dist: maketable experimental.dat
+	./maketable experimental.dat > experimental.dist
+
 install: all
 	mkdir -p $(DESTDIR)/usr/lib/tc
 	for i in $(DISTDATA); \
@@ -20,8 +23,3 @@
 
 clean:
 	rm -f $(DISTDATA) $(DISTGEN)
-
-maketable: maketable.c
-	$(HOSTCC) $(CFLAGS) -o $@ $< -lm
-
-