diff --git a/lib/asn1/gen.c b/lib/asn1/gen.c
index 05f388702..3aa23230b 100644
--- a/lib/asn1/gen.c
+++ b/lib/asn1/gen.c
@@ -161,9 +161,10 @@ define_asn1 (int level, Type *t)
 	    if (tag == -1)
 		tag = m->val;
 	    space(level + 1);
-	    fprintf (headerfile, "%s[%d] ", m->name, m->val);
-	    if(strlen(m->name) < 16)
-		fprintf (headerfile, "%*s", 16 - strlen(m->name), "");
+	    fprintf(headerfile, "%s[%d]", m->name, m->val);
+	    if(strlen(m->name) + 3 + (m->val > 9) < 16)
+		fprintf(headerfile, "%*s", 
+			16 - strlen(m->name) + 3 + (m->val > 9), "");
 	    define_asn1(level + 1, m->type);
 	    if(m->optional)
 		fprintf(headerfile, " OPTIONAL");
diff --git a/lib/asn1/gen_copy.c b/lib/asn1/gen_copy.c
index 1d9de21e9..601bafec2 100644
--- a/lib/asn1/gen_copy.c
+++ b/lib/asn1/gen_copy.c
@@ -137,7 +137,7 @@ void
 generate_type_copy (Symbol *s)
 {
   fprintf (headerfile,
-	   "int copy_%s(const %s *, %s *);\n",
+	   "int    copy_%s  (const %s *, %s *);\n",
 	   s->gen_name, s->gen_name, s->gen_name);
 
   fprintf (codefile, "int\n"
diff --git a/lib/asn1/gen_decode.c b/lib/asn1/gen_decode.c
index db5a2c398..00791502c 100644
--- a/lib/asn1/gen_decode.c
+++ b/lib/asn1/gen_decode.c
@@ -261,7 +261,7 @@ void
 generate_type_decode (Symbol *s)
 {
   fprintf (headerfile,
-	   "int decode_%s(unsigned char *, size_t, %s *, size_t *);\n",
+	   "int    decode_%s(unsigned char *, size_t, %s *, size_t *);\n",
 	   s->gen_name, s->gen_name);
 
   fprintf (codefile, "#define FORW "
diff --git a/lib/asn1/gen_encode.c b/lib/asn1/gen_encode.c
index fa59cc1ca..7dede0185 100644
--- a/lib/asn1/gen_encode.c
+++ b/lib/asn1/gen_encode.c
@@ -207,7 +207,7 @@ void
 generate_type_encode (Symbol *s)
 {
   fprintf (headerfile,
-	   "int encode_%s(unsigned char *, size_t, %s *, size_t *);\n",
+	   "int    encode_%s(unsigned char *, size_t, %s *, size_t *);\n",
 	   s->gen_name, s->gen_name);
 
   fprintf (codefile, "#define BACK if (e) return e; p -= l; len -= l; ret += l\n\n");
diff --git a/lib/asn1/gen_free.c b/lib/asn1/gen_free.c
index e3a8bca28..56a8746f8 100644
--- a/lib/asn1/gen_free.c
+++ b/lib/asn1/gen_free.c
@@ -121,7 +121,7 @@ void
 generate_type_free (Symbol *s)
 {
   fprintf (headerfile,
-	   "void free_%s(%s *);\n",
+	   "void   free_%s  (%s *);\n",
 	   s->gen_name, s->gen_name);
 
   fprintf (codefile, "void\n"