Index: wiretap/pcapng.c
===================================================================
--- wiretap/pcapng.c	(revision 28437)
+++ wiretap/pcapng.c	(working copy)
@@ -1573,7 +1573,7 @@
 
 	/* write the interface description block */
 	wblock.type = BLOCK_TYPE_IDB;
-	wblock.data.if_descr.link_type	= wdh->encap;
+	wblock.data.if_descr.link_type  = wtap_wtap_encap_to_pcap_encap(wdh->encap);
 	wblock.data.if_descr.snap_len	= wdh->snaplen;
 
 	/* XXX - options unused */
@@ -1597,10 +1597,10 @@
 	/* Per-packet encapsulations aren't supported. */
 	if (encap == WTAP_ENCAP_PER_PACKET)
 		return WTAP_ERR_ENCAP_PER_PACKET_UNSUPPORTED;
-
-	/* XXX - for now we only support Ethernet */
-	if (encap != WTAP_ENCAP_ETHERNET)
+    
+	/* Make sure we can figure out this DLT type */
+	if (wtap_wtap_encap_to_pcap_encap(encap) == -1)
 		return WTAP_ERR_UNSUPPORTED_ENCAP;
-
+		
 	return 0;
 }