diff --git a/make/ChangeLog b/make/ChangeLog
index 10315f8a29..2bba5462c2 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-12	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* custom/hurricane.cfg, custom/simsh4.cfg: Now build and link class
+	examples.
+
 2008-08-11	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* custom/rbtx4925.cfg, custom/rbtx4938.cfg: Fix so all C++ example code
diff --git a/make/custom/hurricane.cfg b/make/custom/hurricane.cfg
index d7540beb0a..d69ac46a41 100644
--- a/make/custom/hurricane.cfg
+++ b/make/custom/hurricane.cfg
@@ -22,8 +22,8 @@ CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer
 # is currently required.
 
 define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) \
-	    -o $@ -Xlinker -Map -Xlinker $(basename $@).map $(LINK_OBJS) $(LINK_LIBS)
+	$(LINK.c) $(CPU_CFLAGS) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	    -o $@ $(LINK_OBJS) $(LINK_LIBS)
 	$(OBJCOPY) -O srec $@ $(basename $@).srec1
         $(PACKHEX) < $(basename $@).srec1 > $(basename $@).srec
 	$(RM) $(basename $@).srec1
diff --git a/make/custom/simsh4.cfg b/make/custom/simsh4.cfg
index a24b9606e3..07a7767cbe 100644
--- a/make/custom/simsh4.cfg
+++ b/make/custom/simsh4.cfg
@@ -36,9 +36,8 @@ CFLAGS_OPTIMIZE_V = -O2 -g
 # is currently required.
 
 define make-exe
-	$(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -Wl,-Map,$(basename $@).map \
-	    $(LDLIBS) -o $@ \
-	    $(LINK_OBJS) $(LINK_LIBS)
+	$(LINK.c) $(CPU_CFLAGS) $(CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
+	    $(LDLIBS) -o $@ $(LINK_OBJS) $(LINK_LIBS)
 	$(NM) -g -n $@ > $(basename $@).num
 	$(SIZE) $@
 endef