diff --git a/examples/sample.makefile.regen b/examples/sample.makefile.regen
index f34f0a2..ba03514 100755
--- a/examples/sample.makefile.regen
+++ b/examples/sample.makefile.regen
@@ -23,8 +23,6 @@
 	exit
 fi
 
-ASN1DEFPDU=`echo "$ASN1PDU" | tr - _`
-
 ../../asn1c/asn1c -S ../../skeletons ${ASN1CMDOPTS} ${ASN1MODULES} || exit $?
 
 if test ! -f Makefile.am.sample ; then
@@ -32,20 +30,15 @@
 	exit 1
 fi
 
-CFLAGS=""
-
+ASN1DEFPDU=`echo "$ASN1PDU" | tr - _`
+CFLAGS="-DPDU=${ASN1DEFPDU}"
 if test -f config.h ; then
-	CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
-fi
-
-FIXEDPDU=`echo "[$ASN1CMDOPTS]" | sed -e "s/.*-pdu=auto.*//"`
-if test ! "$FIXEDPDU" ; then
-	CFLAGS="$CFLAGS -DASN_PDU_COLLECTION"
+	CFLAGS="-DHAVE_CONFIG_H $CFLAGS"
 fi
 
 set -x
 cat Makefile.am.sample						\
-	| sed -e "s/^CFLAGS.*/CFLAGS +=$CFLAGS -DPDU=${ASN1DEFPDU} -I./" \
+	| sed -e "s/^CFLAGS += /CFLAGS += ${CFLAGS} /"		\
 	| sed -e "s/^all: /all: ${ASN1PDU}.c /"			\
 	| sed -e "s/progname/${PROGNAME}/"			\
 	> Makefile.$$
diff --git a/examples/sample.source.RRC/Makefile b/examples/sample.source.RRC/Makefile
index db38e98..717e734 100644
--- a/examples/sample.source.RRC/Makefile
+++ b/examples/sample.source.RRC/Makefile
@@ -4740,7 +4740,7 @@
 # This file may be used as an input for make(3)
 # Remove the lines below to convert it into a pure .am file
 TARGET = rrc-dump
-CFLAGS += -DHAVE_CONFIG_H -DASN_PDU_COLLECTION -DPDU=DL_DCCH_Message -I.
+CFLAGS += -DHAVE_CONFIG_H -DPDU=DL_DCCH_Message -DASN_PDU_COLLECTION -I.
 OBJS=${ASN_MODULE_SOURCES:.c=.o} ${ASN_CONVERTER_SOURCES:.c=.o}
 
 all: DL-DCCH-Message.c $(TARGET)