diff --git a/skeletons/asn-decoder-template.c b/skeletons/asn-decoder-template.c
index 4ff524c..76559d1 100644
--- a/skeletons/asn-decoder-template.c
+++ b/skeletons/asn-decoder-template.c
@@ -76,6 +76,7 @@
 		}
 		break;
 	case 'p':
+		opt_toxml = 0;	/* Override '-x' */
 		opt_print++;
 		break;
 	case 's':
@@ -88,6 +89,7 @@
 		}
 		break;
 	case 'x':
+		opt_print = 0;	/* Override '-p' */
 		opt_toxml++;
 		break;
 	case 'h':
@@ -101,7 +103,11 @@
 		"  -n <num>     Process files <num> times\n"
 		"  -s <size>    Set the stack usage limit\n"
 		"  -p           Print out the decoded contents\n"
-		"  -x           Print out as XML\n"
+		"  -x           Print out as XML"
+#ifdef	ASN_DECODER_DEFAULT_OUTPUT_XML
+		" (default)"
+#endif
+		"\n"
 		, av[0], (long)suggested_bufsize);
 		exit(EX_USAGE);
 	}
@@ -114,6 +120,10 @@
 		exit(EX_USAGE);
 	}
 
+#ifdef	ASN_DECODER_DEFAULT_OUTPUT_XML
+	if(!opt_print) opt_toxml++;
+#endif
+
 	setvbuf(stdout, 0, _IOLBF, 0);
 
 	for(num = 0; num < number_of_iterations; num++) {