diff --git a/ChangeLog b/ChangeLog
index ef2d3fbe..28f9a7d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+0.9:	2004-Aug-12
+
+	* Reworked subtype constraints handling, aiming at PER-applicability.
+
 0.8.18:	2004-Aug-12
 
 	* Parser: fixed multiple IMPORTS problem (incorrect assertion).
diff --git a/Makefile.in b/Makefile.in
index 2d797dc2..cce91273 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -184,8 +184,8 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = \
-	libasn1parser libasn1print	\
-	libasn1fix libasn1compiler	\
+	libasn1parser libasn1fix	\
+	libasn1print libasn1compiler	\
 	skeletons examples tests	\
 	doc asn1c
 
diff --git a/asn1c/Makefile.in b/asn1c/Makefile.in
index 5267aa3a..244f501e 100644
--- a/asn1c/Makefile.in
+++ b/asn1c/Makefile.in
@@ -59,7 +59,6 @@ asn1c_LDADD = $(LDADD)
 asn1c_DEPENDENCIES = $(top_builddir)/libasn1parser/libasn1parser.la \
 	$(top_builddir)/libasn1print/libasn1print.la \
 	$(top_builddir)/libasn1fix/libasn1fix.la \
-	$(top_builddir)/libasn1cnst/libasn1cnst.la \
 	$(top_builddir)/libasn1compiler/libasn1compiler.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -213,7 +212,6 @@ LDADD = \
 	$(top_builddir)/libasn1parser/libasn1parser.la	\
 	$(top_builddir)/libasn1print/libasn1print.la	\
 	$(top_builddir)/libasn1fix/libasn1fix.la	\
-	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
 	$(top_builddir)/libasn1compiler/libasn1compiler.la
 
 asn1c_SOURCES = asn1c.c	\
diff --git a/configure b/configure
index 793e9867..096bec4d 100755
--- a/configure
+++ b/configure
@@ -21409,6 +21409,7 @@ fi;
 
 case "$GCC" in
  yes)
+   CFLAGS="$CFLAGS -W"
    CFLAGS="$CFLAGS -Wall"
    CFLAGS="$CFLAGS -Wshadow"
    CFLAGS="$CFLAGS -Wcast-qual"
diff --git a/configure.in b/configure.in
index 7585cede..d9bfa9f6 100644
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,7 @@ AC_SUBST(ADD_CFLAGS)
 dnl Add these flags if we're using GCC.
 case "$GCC" in
  yes)
+   CFLAGS="$CFLAGS -W"
    CFLAGS="$CFLAGS -Wall"
    CFLAGS="$CFLAGS -Wshadow"
    CFLAGS="$CFLAGS -Wcast-qual"
diff --git a/libasn1compiler/Makefile.in b/libasn1compiler/Makefile.in
index d50f04ac..e8153937 100644
--- a/libasn1compiler/Makefile.in
+++ b/libasn1compiler/Makefile.in
@@ -60,7 +60,6 @@ check_compiler_OBJECTS = check_compiler.$(OBJEXT)
 am__DEPENDENCIES_1 = libasn1compiler.la
 check_compiler_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(top_builddir)/libasn1parser/libasn1parser.la \
-	$(top_builddir)/libasn1cnst/libasn1cnst.la \
 	$(top_builddir)/libasn1fix/libasn1fix.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -215,7 +214,6 @@ libasn1compiler_la_SOURCES = \
 TESTS = $(check_PROGRAMS)
 check_compiler_LDADD = $(noinst_LTLIBRARIES)		\
 	$(top_builddir)/libasn1parser/libasn1parser.la	\
-	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
 	$(top_builddir)/libasn1fix/libasn1fix.la
 
 all: all-am
diff --git a/libasn1fix/Makefile.am b/libasn1fix/Makefile.am
index 93732542..0db2c685 100644
--- a/libasn1fix/Makefile.am
+++ b/libasn1fix/Makefile.am
@@ -1,8 +1,7 @@
 
 AM_CFLAGS = @ADD_CFLAGS@
 AM_CPPFLAGS =				\
-	-I$(top_srcdir)/libasn1parser	\
-	-I$(top_srcdir)/libasn1cnst
+	-I$(top_srcdir)/libasn1parser
 
 noinst_LTLIBRARIES = libasn1fix.la
 
@@ -32,7 +31,6 @@ libasn1fix_la_SOURCES =					\
 check_PROGRAMS = check_fixer
 
 check_fixer_LDADD = $(noinst_LTLIBRARIES)		\
-	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
 	$(top_builddir)/libasn1parser/libasn1parser.la
 check_fixer_DEPENDENCIES = $(check_fixer_LDADD)
 
diff --git a/libasn1fix/Makefile.in b/libasn1fix/Makefile.in
index 80a91c0e..3224cd8b 100644
--- a/libasn1fix/Makefile.in
+++ b/libasn1fix/Makefile.in
@@ -210,8 +210,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 AM_CFLAGS = @ADD_CFLAGS@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/libasn1parser	\
-	-I$(top_srcdir)/libasn1cnst
+	-I$(top_srcdir)/libasn1parser
 
 noinst_LTLIBRARIES = libasn1fix.la
 libasn1fix_la_LDFLAGS = -all-static
@@ -238,7 +237,6 @@ libasn1fix_la_SOURCES = \
 	asn1fix_constraint_compat.c
 
 check_fixer_LDADD = $(noinst_LTLIBRARIES)		\
-	$(top_builddir)/libasn1cnst/libasn1cnst.la	\
 	$(top_builddir)/libasn1parser/libasn1parser.la
 
 check_fixer_DEPENDENCIES = $(check_fixer_LDADD)
diff --git a/libasn1parser/Makefile.in b/libasn1parser/Makefile.in
index 4af09101..93bf68e0 100644
--- a/libasn1parser/Makefile.in
+++ b/libasn1parser/Makefile.in
@@ -546,9 +546,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f asn1p_y.h
 	-rm -f asn1p_l.c
 	-rm -f asn1p_y.c
-	-rm -f asn1p_y.h
 clean: clean-am
 
 clean-am: clean-checkPROGRAMS clean-generic clean-libtool \