--- zoneparser2.cc.orig	2004-03-02 02:47:35.000000000 +0100
+++ zoneparser2.cc	2004-03-02 02:49:16.000000000 +0100
@@ -235,7 +235,9 @@
   stringtok(parts,tline," \t\"");  // THIS IS WRONG, THE " SHOULD BE TREATED! XXX FIXME
   if(parts[0][0]!='$' && !isspace(parts[0][0]))
     lastfirstword=parts[0];
-
+  else if(parts[0][0]=='$' && parts[0]=='$ORIGIN')
+    lastfirstword='@';  // Reset default qname
+  
   //  for_each(parts.begin(),parts.end(),print);
   tline="";
   return parseLine(parts,rec);