diff --git a/.gitignore b/.gitignore
index e68956c9..b75eaa80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,8 @@ TAGS
 /version.h
 /version.mac
 /version.mak
-/version.nsh
 /version.sed
 /iflag.c
 /iflaggen.h
+/nsis/version.nsh
+/nsis/arch.nsh
diff --git a/Makefile.in b/Makefile.in
index 6b5fbb4c..d3119994 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,6 +38,8 @@ NROFF		= @NROFF@
 ASCIIDOC	= @ASCIIDOC@
 XMLTO		= @XMLTO@
 
+MAKENSIS	= makensis
+
 MKDIR		= mkdir
 RM		= rm
 
@@ -57,7 +59,7 @@ endif
 
 .PHONY: all doc rdf install clean distclean cleaner spotless install_rdf test
 .PHONY: install_doc everything install_everything strip perlreq dist tags TAGS
-.PHONY: manpages
+.PHONY: manpages nsis
 
 .c.$(O):
 	$(CC) -c $(ALL_CFLAGS) -o $@ $<
@@ -74,7 +76,6 @@ endif
 .xml.1:
 	$(XMLTO) man --skip-validation $< 2>/dev/null
 
-
 #-- Begin File Lists --#
 NASM =	nasm.$(O) nasmlib.$(O) ver.$(O) \
 	raa.$(O) saa.$(O) rbtree.$(O) \
@@ -103,7 +104,7 @@ NDISASM = ndisasm.$(O) disasm.$(O) sync.$(O) nasmlib.$(O) ver.$(O) \
 	disp8.$(O) iflag.$(O)
 #-- End File Lists --#
 
-all: nasm$(X) ndisasm$(X) manpages rdf
+all: nasm$(X) ndisasm$(X) rdf
 
 nasm$(X): $(NASM) $(LIBOBJS)
 	$(CC) $(LDFLAGS) -o nasm$(X) $(NASM) $(LIBOBJS) $(LIBS)
@@ -142,8 +143,8 @@ version.sed: version version.pl
 	$(RUNPERL) $(srcdir)/version.pl sed < $(srcdir)/version > version.sed
 version.mak: version version.pl
 	$(RUNPERL) $(srcdir)/version.pl make < $(srcdir)/version > version.mak
-version.nsh: version version.pl
-	$(RUNPERL) $(srcdir)/version.pl nsis < $(srcdir)/version > version.nsh
+nsis/version.nsh: version version.pl
+	$(RUNPERL) $(srcdir)/version.pl nsis < $(srcdir)/version > nsis/version.nsh
 
 # This source file is generated from the standard macros file
 # `standard.mac' by another Perl script. Again, it's part of the
@@ -198,10 +199,19 @@ PERLREQ = macros.c insnsb.c insnsa.c insnsd.c insnsi.h insnsn.c \
 	  regs.c regs.h regflags.c regdis.c regdis.h regvals.c \
 	  tokhash.c tokens.h pptok.h pptok.c pptok.ph \
 	  directiv.c directiv.h \
-	  version.h version.mac version.mak version.nsh \
-	  iflag.c iflaggen.h
+	  iflag.c iflaggen.h \
+	  version.h version.mac version.mak nsis/version.nsh
 perlreq: $(PERLREQ)
 
+# NSIS is not built except by explicit request, as it only applies to
+# Windows platforms
+nsis/arch.nsh: nsis/getpearch.pl nasm$(X)
+	$(PERL) $(srcdir)/nsis/getpearch.pl nasm$(X) > nsis/arch.nsh
+
+# Should only be done after "make everything"
+nsis: nsis/nasm.nsi nsis/arch.nsh nsis/version.nsh
+	$(MAKENSIS) nsis/nasm.nsi
+
 # Generated manpages, also pregenerated for distribution
 manpages: nasm.1 ndisasm.1
 
@@ -218,7 +228,9 @@ clean:
 	$(RM) -f lib/*.$(O) lib/*.s lib/*.i
 	$(RM) -f output/*.$(O) output/*.s output/*.i
 	$(RM) -f nasm$(X) ndisasm$(X)
+	$(RM) -f nasm-*-installer-*.exe
 	$(RM) -f tags TAGS
+	$(RM) -f nsis/arch.nsh
 	cd rdoff && $(MAKE) clean
 
 distclean: clean
@@ -264,7 +276,7 @@ doc:
 doc_install install_doc:
 	cd doc && $(MAKE) install
 
-everything: all doc rdf
+everything: all manpages doc rdf
 
 install_everything: everything install install_doc install_rdf
 
diff --git a/assemble.c b/assemble.c
index 385d3577..584bed72 100644
--- a/assemble.c
+++ b/assemble.c
@@ -348,7 +348,7 @@ static void out(int64_t offset, int32_t segto, const void *data,
         uint8_t *q = p;
         
         if (asize > 8) {
-            nasm_error(ERR_PANIC, "OUT_ADDRESS with size > 8");
+            nasm_panic(0, "OUT_ADDRESS with size > 8");
             return;
         }
 
@@ -591,7 +591,7 @@ int64_t assemble(int32_t segment, int64_t offset, int bits, iflag_t cp,
         int64_t insn_size = calcsize(segment, offset, bits, instruction, temp);
         itimes = instruction->times;
         if (insn_size < 0)  /* shouldn't be, on pass two */
-            nasm_error(ERR_PANIC, "errors made it through from pass one");
+            nasm_panic(0, "errors made it through from pass one");
         else
             while (itimes--) {
                 for (j = 0; j < MAXPREFIX; j++) {
@@ -697,7 +697,7 @@ int64_t assemble(int32_t segment, int64_t offset, int bits, iflag_t cp,
                     case P_none:
                         break;
                     default:
-                        nasm_error(ERR_PANIC, "invalid instruction prefix");
+                        nasm_panic(0, "invalid instruction prefix");
                     }
                     if (c != 0) {
                         out(offset, segment, &c, OUT_RAWDATA, 1,
@@ -1301,7 +1301,7 @@ static int64_t calcsize(int32_t segment, int64_t offset, int bits,
             break;
 
         default:
-            nasm_error(ERR_PANIC, "internal instruction table corrupt"
+            nasm_panic(0, "internal instruction table corrupt"
                     ": instruction code \\%o (0x%02X) given", c, c);
             break;
         }
@@ -1822,7 +1822,7 @@ static void gencode(int32_t segment, int64_t offset, int bits,
 
         case 0340:
             if (ins->oprs[0].segment != NO_SEG)
-                nasm_error(ERR_PANIC, "non-constant BSS size in pass two");
+                nasm_panic(0, "non-constant BSS size in pass two");
             else {
                 int64_t size = ins->oprs[0].offset;
                 if (size > 0)
@@ -1967,7 +1967,7 @@ static void gencode(int32_t segment, int64_t offset, int bits,
             break;
 
         default:
-            nasm_error(ERR_PANIC, "internal instruction table corrupt"
+            nasm_panic(0, "internal instruction table corrupt"
                     ": instruction code \\%o (0x%02X) given", c, c);
             break;
         }
@@ -1977,14 +1977,14 @@ static void gencode(int32_t segment, int64_t offset, int bits,
 static opflags_t regflag(const operand * o)
 {
     if (!is_register(o->basereg))
-        nasm_error(ERR_PANIC, "invalid operand passed to regflag()");
+        nasm_panic(0, "invalid operand passed to regflag()");
     return nasm_reg_flags[o->basereg];
 }
 
 static int32_t regval(const operand * o)
 {
     if (!is_register(o->basereg))
-        nasm_error(ERR_PANIC, "invalid operand passed to regval()");
+        nasm_panic(0, "invalid operand passed to regval()");
     return nasm_regvals[o->basereg];
 }
 
@@ -1994,7 +1994,7 @@ static int op_rexflags(const operand * o, int mask)
     int val;
 
     if (!is_register(o->basereg))
-        nasm_error(ERR_PANIC, "invalid operand passed to op_rexflags()");
+        nasm_panic(0, "invalid operand passed to op_rexflags()");
 
     flags = nasm_reg_flags[o->basereg];
     val = nasm_regvals[o->basereg];
diff --git a/doc/changes.src b/doc/changes.src
index 9f1c5631..62ece40f 100644
--- a/doc/changes.src
+++ b/doc/changes.src
@@ -12,6 +12,10 @@ since 2007.
 
 \b Portability fixes for some platforms.
 
+\b Fix error when not specifying a list file.
+
+\b Add \c{CLZERO}, \c{MONITORX} and \c{MWAITX} instructions.
+
 
 \S{cl-2.12} Version 2.12
 
diff --git a/eval.c b/eval.c
index f1fb05eb..666ff6b6 100644
--- a/eval.c
+++ b/eval.c
@@ -752,7 +752,7 @@ static int64_t eval_ifunc(int64_t val, enum ifunc func)
         break;
 
     default:
-        nasm_error(ERR_PANIC, "invalid IFUNC token %d", func);
+        nasm_panic(0, "invalid IFUNC token %d", func);
         rv = 0;
         break;
     }
diff --git a/float.c b/float.c
index adf18c5b..e30e1eff 100644
--- a/float.c
+++ b/float.c
@@ -733,7 +733,7 @@ static int to_float(const char *str, int s, uint8_t *result,
     const char *strend;
 
     if (!str[0]) {
-        nasm_error(ERR_PANIC,
+        nasm_panic(0,
               "internal errror: empty string passed to float_const");
         return 0;
     }
@@ -916,7 +916,7 @@ int float_const(const char *number, int sign, uint8_t *result, int bytes)
     case 16:
         return to_float(number, sign, result, &ieee_128);
     default:
-        nasm_error(ERR_PANIC, "strange value %d passed to float_const", bytes);
+        nasm_panic(0, "strange value %d passed to float_const", bytes);
         return 0;
     }
 }
diff --git a/insns.dat b/insns.dat
index c3bf293c..293f9410 100644
--- a/insns.dat
+++ b/insns.dat
@@ -799,6 +799,8 @@ MFENCE		void				[	np 0f ae f0]				X64,AMD
 MONITOR		void				[	0f 01 c8]				PRESCOTT
 MONITOR		reg_eax,reg_ecx,reg_edx		[---:	0f 01 c8]				PRESCOTT,NOLONG,ND
 MONITOR		reg_rax,reg_ecx,reg_edx		[---:	0f 01 c8]				X64,ND
+MONITORX	void				[	0f 01 fa]				X64,AMD
+MONITORX	reg_rax,reg_ecx,reg_edx		[---:	0f 01 fa]				X64,AMD,ND
 MOV		mem,reg_sreg			[mr:	8c /r]					8086,SW
 MOV		reg16,reg_sreg			[mr:	o16 8c /r]				8086
 MOV		reg32,reg_sreg			[mr:	o32 8c /r]				386
@@ -891,6 +893,8 @@ MUL		rm32				[m:	o32 f7 /4]				386
 MUL		rm64				[m:	o64 f7 /4]				X64
 MWAIT		void				[	0f 01 c9]				PRESCOTT
 MWAIT		reg_eax,reg_ecx			[--:	0f 01 c9]				PRESCOTT,ND
+MWAITX		void				[	0f 01 fb]				X64,AMD
+MWAITX		reg_eax,reg_ecx			[--:	0f 01 fb]				X64,AMD,ND
 NEG		rm8				[m:	hle f6 /3]				8086,LOCK
 NEG		rm16				[m:	hle o16 f7 /3]				8086,LOCK
 NEG		rm32				[m:	hle o32 f7 /3]				386,LOCK
@@ -5111,6 +5115,9 @@ WRPKRU		void				[	0f 01 ef]				X64,FUTURE
 ; New memory instructions
 CLFLUSHOPT	mem				[m:	66 0f ae /7]				FUTURE
 
+; AMD Zen v1
+CLZERO		void				[	0f 01 fc]				X64,FUTURE,AMD
+
 ;# Systematic names for the hinting nop instructions
 ; These should be last in the file
 HINT_NOP0	rm16				[m:	o16 0f 18 /0]				P6,UNDOC
diff --git a/labels.c b/labels.c
index b4433d00..94c2ae6f 100644
--- a/labels.c
+++ b/labels.c
@@ -234,7 +234,7 @@ void redefine_label(char *label, int32_t segment, int64_t offset, char *special,
 
     lptr = find_label(label, 1);
     if (!lptr)
-        nasm_error(ERR_PANIC, "can't find label `%s' on pass two", label);
+        nasm_panic(0, "can't find label `%s' on pass two", label);
 
     if (!islocal(label)) {
         if (!islocalchar(*label) && lptr->defn.is_norm)
diff --git a/lib/vsnprintf.c b/lib/vsnprintf.c
index bc54f949..ecca3e66 100644
--- a/lib/vsnprintf.c
+++ b/lib/vsnprintf.c
@@ -23,7 +23,7 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap)
     int rv, bytes;
 
     if (size > BUFFER_SIZE) {
-        nasm_error(ERR_PANIC|ERR_NOFILE,
+        nasm_panic(ERR_NOFILE,
                    "vsnprintf: size (%d) > BUFFER_SIZE (%d)",
                    size, BUFFER_SIZE);
         size = BUFFER_SIZE;
@@ -31,7 +31,7 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap)
 
     rv = vsprintf(snprintf_buffer, format, ap);
     if (rv >= BUFFER_SIZE)
-        nasm_error(ERR_PANIC|ERR_NOFILE, "vsnprintf buffer overflow");
+        nasm_panic(ERR_NOFILE, "vsnprintf buffer overflow");
 
     if (size > 0) {
         if ((size_t)rv < size-1)
diff --git a/listing.c b/listing.c
index f43381fa..828eceeb 100644
--- a/listing.c
+++ b/listing.c
@@ -128,7 +128,7 @@ static void list_emit(void)
 
 static void list_init(const char *fname)
 {
-    if (!fname) {
+    if (!fname || fname[0] == '\0') {
 	listfp = NULL;
 	return;
     }
@@ -337,4 +337,3 @@ static const struct lfmt nasm_list = {
 };
 
 const struct lfmt *lfmt = &nasm_list;
- 
diff --git a/nasm.c b/nasm.c
index 20e01b6e..0d4a87c7 100644
--- a/nasm.c
+++ b/nasm.c
@@ -394,7 +394,7 @@ int main(int argc, char **argv)
             if (*outname) {
                 ofile = fopen(outname, "w");
                 if (!ofile)
-                    nasm_error(ERR_FATAL | ERR_NOFILE,
+                    nasm_fatal(ERR_NOFILE,
                                  "unable to open output file `%s'",
                                  outname);
             } else
@@ -448,7 +448,7 @@ int main(int argc, char **argv)
 
         ofile = fopen(outname, (ofmt->flags & OFMT_TEXT) ? "w" : "wb");
         if (!ofile)
-            nasm_error(ERR_FATAL | ERR_NOFILE,
+            nasm_fatal(ERR_NOFILE,
                        "unable to open output file `%s'", outname);
 
         /*
@@ -520,7 +520,7 @@ static void copy_filename(char *dst, const char *src)
     size_t len = strlen(src);
 
     if (len >= (size_t)FILENAME_MAX) {
-        nasm_error(ERR_FATAL | ERR_NOFILE, "file name too long");
+        nasm_fatal(ERR_NOFILE, "file name too long");
         return;
     }
     strncpy(dst, src, FILENAME_MAX);
@@ -660,7 +660,7 @@ static bool process_arg(char *p, char *q)
         case 'f':       /* output format */
             ofmt = ofmt_find(param, &ofmt_alias);
             if (!ofmt) {
-                nasm_error(ERR_FATAL | ERR_NOFILE | ERR_USAGE,
+                nasm_fatal(ERR_NOFILE | ERR_USAGE,
                            "unrecognised output format `%s' - "
                            "use -hf for a list", param);
             }
@@ -701,7 +701,7 @@ static bool process_arg(char *p, char *q)
                         break;
 
                     default:
-                        nasm_error(ERR_FATAL,
+                        nasm_fatal(0,
                                    "unknown optimization option -O%c\n",
                                    *param);
                         break;
@@ -744,7 +744,7 @@ static bool process_arg(char *p, char *q)
         case 'F':       /* specify debug format */
             dfmt = dfmt_find(ofmt, param);
             if (!dfmt) {
-                nasm_error(ERR_FATAL | ERR_NOFILE | ERR_USAGE,
+                nasm_fatal(ERR_NOFILE | ERR_USAGE,
                            "unrecognized debug format `%s' for"
                            " output format `%s'",
                            param, ofmt->shortname);
@@ -758,7 +758,7 @@ static bool process_arg(char *p, char *q)
             else if (nasm_stricmp("gnu", param) == 0)
                 nasm_set_verror(nasm_verror_gnu);
             else
-                nasm_error(ERR_FATAL | ERR_NOFILE | ERR_USAGE,
+                nasm_fatal(ERR_NOFILE | ERR_USAGE,
                            "unrecognized error reporting format `%s'",
                            param);
             break;
@@ -969,7 +969,7 @@ set_warning:
                             strlcpy(lpostfix, param, POSTFIX_MAX);
                             break;
                         default:
-                            nasm_error(ERR_PANIC | ERR_NOFILE,
+                            nasm_panic(ERR_NOFILE,
                                        "internal error");
                             break;
                         }
@@ -1172,7 +1172,7 @@ static void parse_cmdline(int argc, char **argv)
              !strcmp(inname, outname)   ||
              !strcmp(inname, listname)  ||
              (depend_file && !strcmp(inname, depend_file)))
-        nasm_error(ERR_FATAL | ERR_NOFILE | ERR_USAGE,
+        nasm_fatal(ERR_NOFILE | ERR_USAGE,
                    "file `%s' is both input and output file",
                    inname);
 
@@ -1180,7 +1180,7 @@ static void parse_cmdline(int argc, char **argv)
         error_file = fopen(errname, "w");
         if (!error_file) {
             error_file = stderr;        /* Revert to default! */
-            nasm_error(ERR_FATAL | ERR_NOFILE | ERR_USAGE,
+            nasm_fatal(ERR_NOFILE | ERR_USAGE,
                        "cannot open file `%s' for error messages",
                        errname);
         }
@@ -1278,7 +1278,7 @@ static void assemble_file(char *fname, StrList **depend_ptr)
                                  * ofmt should have some 'check' method which
                                  * would report segment alignment bounds.
                                  */
-                                nasm_error(ERR_FATAL,
+                                nasm_fatal(0,
                                            "incorrect segment alignment `%s'", value);
                             } else if (!is_power2(align)) {
                                 nasm_error(ERR_NONFATAL,
@@ -1441,7 +1441,7 @@ static void assemble_file(char *fname, StrList **depend_ptr)
                     } else if (passn == 1)
                         abs_offset = 0x100;     /* don't go near zero in case of / */
                     else
-                        nasm_error(ERR_PANIC, "invalid ABSOLUTE address "
+                        nasm_panic(0, "invalid ABSOLUTE address "
                                      "in pass two");
                     in_abs_seg = true;
                     location.segment = NO_SEG;
diff --git a/nasmlib.c b/nasmlib.c
index 41da9f0e..74466e8b 100644
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -158,7 +158,7 @@ char *nasm_strndup(const char *s, size_t len)
 
 no_return nasm_assert_failed(const char *file, int line, const char *msg)
 {
-    nasm_error(ERR_FATAL, "assertion %s failed at %s:%d", msg, file, line);
+    nasm_fatal(0, "assertion %s failed at %s:%d", msg, file, line);
     exit(1);
 }
 
@@ -166,7 +166,7 @@ void nasm_write(const void *ptr, size_t size, FILE *f)
 {
     size_t n = fwrite(ptr, 1, size, f);
     if (n != size || ferror(f) || feof(f))
-        nasm_error(ERR_FATAL, "unable to write output: %s", strerror(errno));
+        nasm_fatal(0, "unable to write output: %s", strerror(errno));
 }
 
 #ifndef nasm_stricmp
diff --git a/nsis/MultiUser.nsh b/nsis/MultiUser.nsh
new file mode 100755
index 00000000..a04048ab
--- /dev/null
+++ b/nsis/MultiUser.nsh
@@ -0,0 +1,470 @@
+/*
+
+MultiUser.nsh
+
+Installer configuration for multi-user Windows environments
+
+Copyright 2008-2009 Joost Verburg
+Updated 2016 by H. Peter Anvin to handle 64-bit Windows
+
+*/
+
+!ifndef MULTIUSER_INCLUDED
+!define MULTIUSER_INCLUDED
+!verbose push
+!verbose 3
+
+;Standard NSIS header files
+
+!ifdef MULTIUSER_MUI
+  !include MUI2.nsh
+!endif
+!include nsDialogs.nsh
+!include LogicLib.nsh
+!include WinVer.nsh
+!include FileFunc.nsh
+
+;Variables
+
+Var MultiUser.Privileges
+Var MultiUser.InstallMode
+
+;Command line installation mode setting
+
+!ifdef MULTIUSER_INSTALLMODE_COMMANDLINE
+  !include StrFunc.nsh
+  !ifndef StrStr_INCLUDED
+    ${StrStr}
+  !endif
+  !ifndef MULTIUSER_NOUNINSTALL
+    !ifndef UnStrStr_INCLUDED
+      ${UnStrStr}
+    !endif
+  !endif
+  
+  Var MultiUser.Parameters
+  Var MultiUser.Result
+!endif
+
+;Installation folder stored in registry
+
+!ifdef MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY & MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME
+  Var MultiUser.InstDir
+!endif
+
+!ifdef MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY & MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME
+  Var MultiUser.DefaultKeyValue
+!endif
+
+;Windows Vista UAC setting
+
+!if "${MULTIUSER_EXECUTIONLEVEL}" == Admin
+  RequestExecutionLevel admin
+  !define MULTIUSER_EXECUTIONLEVEL_ALLUSERS
+!else if "${MULTIUSER_EXECUTIONLEVEL}" == Power
+  RequestExecutionLevel admin
+  !define MULTIUSER_EXECUTIONLEVEL_ALLUSERS
+!else if "${MULTIUSER_EXECUTIONLEVEL}" == Highest
+  RequestExecutionLevel highest
+  !define MULTIUSER_EXECUTIONLEVEL_ALLUSERS
+!else
+  RequestExecutionLevel user
+!endif
+
+/*
+
+Install modes
+
+*/
+
+!macro MULTIUSER_INSTALLMODE_ALLUSERS UNINSTALLER_PREFIX UNINSTALLER_FUNCPREFIX
+
+  ;Install mode initialization - per-machine
+
+  ${ifnot} ${IsNT}
+    ${orif} $MultiUser.Privileges == "Admin"
+    ${orif} $MultiUser.Privileges == "Power"
+  
+    StrCpy $MultiUser.InstallMode AllUsers
+  
+    SetShellVarContext all
+  
+    !if "${UNINSTALLER_PREFIX}" != UN
+      ;Set default installation location for installer
+      !ifdef MULTIUSER_INSTALLMODE_INSTDIR
+        StrCpy $INSTDIR "${GLOBALINSTDIR}\${MULTIUSER_INSTALLMODE_INSTDIR}"
+      !endif
+    !endif
+  
+    !ifdef MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY & MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME
+  
+      ReadRegStr $MultiUser.InstDir HKLM "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME}"
+  
+      ${if} $MultiUser.InstDir != ""
+        StrCpy $INSTDIR $MultiUser.InstDir
+      ${endif}
+  
+    !endif
+  
+    !ifdef MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION
+      Call "${MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION}"
+    !endif
+    
+  ${endif}
+
+!macroend
+
+!macro MULTIUSER_INSTALLMODE_CURRENTUSER UNINSTALLER_PREFIX UNINSTALLER_FUNCPREFIX
+
+  ;Install mode initialization - per-user
+  
+  ${if} ${IsNT}  
+  
+    StrCpy $MultiUser.InstallMode CurrentUser
+    
+    SetShellVarContext current
+  
+    !if "${UNINSTALLER_PREFIX}" != UN
+      ;Set default installation location for installer  
+      !ifdef MULTIUSER_INSTALLMODE_INSTDIR
+        ${if} ${AtLeastWin2000}
+          StrCpy $INSTDIR "$LOCALAPPDATA\bin\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        ${else}
+          StrCpy $INSTDIR "${GLOBALINSTDIR}\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        ${endif}
+      !endif
+    !endif
+  
+    !ifdef MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY & MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME
+  
+      ReadRegStr $MultiUser.InstDir HKCU "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME}"
+  
+      ${if} $MultiUser.InstDir != ""
+        StrCpy $INSTDIR $MultiUser.InstDir
+      ${endif}
+  
+    !endif
+  
+    !ifdef MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION
+      Call "${MULTIUSER_INSTALLMODE_${UNINSTALLER_PREFIX}FUNCTION}"
+    !endif
+  
+  ${endif}
+
+!macroend
+
+Function MultiUser.InstallMode.AllUsers
+  !insertmacro MULTIUSER_INSTALLMODE_ALLUSERS "" ""
+FunctionEnd
+
+Function MultiUser.InstallMode.CurrentUser
+  !insertmacro MULTIUSER_INSTALLMODE_CURRENTUSER "" ""
+FunctionEnd
+
+!ifndef MULTIUSER_NOUNINSTALL
+
+Function un.MultiUser.InstallMode.AllUsers
+  !insertmacro MULTIUSER_INSTALLMODE_ALLUSERS UN .un
+FunctionEnd
+
+Function un.MultiUser.InstallMode.CurrentUser
+  !insertmacro MULTIUSER_INSTALLMODE_CURRENTUSER UN .un
+FunctionEnd
+
+!endif
+
+/*
+
+Installer/uninstaller initialization
+
+*/
+
+!macro MULTIUSER_INIT_QUIT UNINSTALLER_FUNCPREFIX
+
+  !ifdef MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUNCTIONQUIT
+    Call "${MULTIUSER_INIT_${UNINSTALLER_FUNCPREFIX}FUCTIONQUIT}
+  !else
+    Quit
+  !endif
+
+!macroend
+
+!macro MULTIUSER_INIT_TEXTS
+
+  !ifndef MULTIUSER_INIT_TEXT_ADMINREQUIRED
+    !define MULTIUSER_INIT_TEXT_ADMINREQUIRED "$(^Caption) requires Administrator priviledges."
+  !endif
+
+  !ifndef MULTIUSER_INIT_TEXT_POWERREQUIRED
+    !define MULTIUSER_INIT_TEXT_POWERREQUIRED "$(^Caption) requires at least Power User priviledges."
+  !endif
+
+  !ifndef MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE
+    !define MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE "Your user account does not have sufficient privileges to install $(^Name) for all users of this compuetr."
+  !endif
+
+!macroend
+
+!macro MULTIUSER_INIT_CHECKS UNINSTALLER_PREFIX UNINSTALLER_FUNCPREFIX
+
+  ;Installer initialization - check privileges and set install mode
+
+  !insertmacro MULTIUSER_INIT_TEXTS
+
+  UserInfo::GetAccountType
+  Pop $MultiUser.Privileges
+  
+  ${if} ${IsNT}
+  
+    ;Check privileges
+  
+    !if "${MULTIUSER_EXECUTIONLEVEL}" == Admin
+  
+      ${if} $MultiUser.Privileges != "Admin"
+        MessageBox MB_OK|MB_ICONSTOP "${MULTIUSER_INIT_TEXT_ADMINREQUIRED}"
+        !insertmacro MULTIUSER_INIT_QUIT "${UNINSTALLER_FUNCPREFIX}"
+      ${endif}
+  
+    !else if "${MULTIUSER_EXECUTIONLEVEL}" == Power
+  
+      ${if} $MultiUser.Privileges != "Power"
+        ${andif} $MultiUser.Privileges != "Admin"
+        ${if} ${AtMostWinXP}
+           MessageBox MB_OK|MB_ICONSTOP "${MULTIUSER_INIT_TEXT_POWERREQUIRED}"
+        ${else}
+           MessageBox MB_OK|MB_ICONSTOP "${MULTIUSER_INIT_TEXT_ADMINREQUIRED}"
+        ${endif}        
+        !insertmacro MULTIUSER_INIT_QUIT "${UNINSTALLER_FUNCPREFIX}"
+      ${endif}
+  
+    !endif
+    
+    !ifdef MULTIUSER_EXECUTIONLEVEL_ALLUSERS
+    
+      ;Default to per-machine installation if possible
+    
+      ${if} $MultiUser.Privileges == "Admin"
+        ${orif} $MultiUser.Privileges == "Power"
+        !ifndef MULTIUSER_INSTALLMODE_DEFAULT_CURRENTUSER
+          Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
+        !else
+          Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.CurrentUser
+        !endif
+
+        !ifdef MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY & MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME
+
+          ;Set installation mode to setting from a previous installation
+
+          !ifndef MULTIUSER_INSTALLMODE_DEFAULT_CURRENTUSER
+            ReadRegStr $MultiUser.DefaultKeyValue HKLM "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME}"
+            ${if} $MultiUser.DefaultKeyValue == ""
+              ReadRegStr $MultiUser.DefaultKeyValue HKCU "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME}"
+              ${if} $MultiUser.DefaultKeyValue != ""
+                Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.CurrentUser
+              ${endif}
+            ${endif}
+          !else
+            ReadRegStr $MultiUser.DefaultKeyValue HKCU "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME}"
+            ${if} $MultiUser.DefaultKeyValue == ""
+              ReadRegStr $MultiUser.DefaultKeyValue HKLM "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY}" "${MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME}"
+              ${if} $MultiUser.DefaultKeyValue != ""
+                Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
+              ${endif}
+            ${endif}
+          !endif
+
+        !endif
+
+      ${else}
+        Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.CurrentUser
+      ${endif}
+    
+    !else
+
+      Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.CurrentUser
+
+    !endif  
+  
+    !ifdef MULTIUSER_INSTALLMODE_COMMANDLINE
+    
+      ;Check for install mode setting on command line
+
+      ${${UNINSTALLER_FUNCPREFIX}GetParameters} $MultiUser.Parameters
+  
+      ${${UNINSTALLER_PREFIX}StrStr} $MultiUser.Result $MultiUser.Parameters "/CurrentUser"    
+    
+      ${if} $MultiUser.Result != ""
+        Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.CurrentUser
+      ${endif}    
+  
+      ${${UNINSTALLER_PREFIX}StrStr} $MultiUser.Result $MultiUser.Parameters "/AllUsers"    
+    
+      ${if} $MultiUser.Result != ""
+        ${if} $MultiUser.Privileges == "Admin"
+          ${orif} $MultiUser.Privileges == "Power"
+          Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
+        ${else}
+          MessageBox MB_OK|MB_ICONSTOP "${MULTIUSER_INIT_TEXT_ALLUSERSNOTPOSSIBLE}"
+        ${endif}
+      ${endif}
+  
+    !endif
+    
+  ${else}
+  
+    ;Not running Windows NT, per-user installation not supported
+    
+    Call ${UNINSTALLER_FUNCPREFIX}MultiUser.InstallMode.AllUsers
+  
+  ${endif}
+
+!macroend
+
+!macro MULTIUSER_INIT
+  !verbose push
+  !verbose 3
+  
+  !insertmacro MULTIUSER_INIT_CHECKS "" ""
+  
+  !verbose pop 
+!macroend
+
+!ifndef MULTIUSER_NOUNINSTALL
+
+!macro MULTIUSER_UNINIT
+  !verbose push
+  !verbose 3
+  
+  !insertmacro MULTIUSER_INIT_CHECKS Un un.
+  
+  !verbose pop 
+!macroend
+
+!endif
+
+/*
+
+Modern UI 2 page
+
+*/
+
+!ifdef MULTIUSER_MUI
+
+!macro MULTIUSER_INSTALLMODEPAGE_INTERFACE
+
+  !ifndef MULTIUSER_INSTALLMODEPAGE_INTERFACE
+    !define MULTIUSER_INSTALLMODEPAGE_INTERFACE
+    Var MultiUser.InstallModePage
+    
+    Var MultiUser.InstallModePage.Text
+    
+    Var MultiUser.InstallModePage.AllUsers
+    Var MultiUser.InstallModePage.CurrentUser
+    
+    Var MultiUser.InstallModePage.ReturnValue
+  !endif
+
+!macroend
+
+!macro MULTIUSER_PAGEDECLARATION_INSTALLMODE
+
+  !insertmacro MUI_SET MULTIUSER_${MUI_PAGE_UNINSTALLER_PREFIX}INSTALLMODEPAGE ""
+  !insertmacro MULTIUSER_INSTALLMODEPAGE_INTERFACE
+
+  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_TOP "$(MULTIUSER_INNERTEXT_INSTALLMODE_TOP)"
+  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS "$(MULTIUSER_INNERTEXT_INSTALLMODE_ALLUSERS)"
+  !insertmacro MUI_DEFAULT MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER "$(MULTIUSER_INNERTEXT_INSTALLMODE_CURRENTUSER)"  
+
+  PageEx custom
+
+    PageCallbacks MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+
+    Caption " "
+
+  PageExEnd
+
+  !insertmacro MULTIUSER_FUNCTION_INSTALLMODEPAGE MultiUser.InstallModePre_${MUI_UNIQUEID} MultiUser.InstallModeLeave_${MUI_UNIQUEID}
+
+  !undef MULTIUSER_INSTALLMODEPAGE_TEXT_TOP
+  !undef MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS
+  !undef MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER
+
+!macroend
+
+!macro MULTIUSER_PAGE_INSTALLMODE
+
+  ;Modern UI page for install mode
+
+  !verbose push
+  !verbose 3
+  
+  !ifndef MULTIUSER_EXECUTIONLEVEL_ALLUSERS
+    !error "A mixed-mode installation requires MULTIUSER_EXECUTIONLEVEL to be set to Admin, Power or Highest."
+  !endif
+  
+  !insertmacro MUI_PAGE_INIT
+  !insertmacro MULTIUSER_PAGEDECLARATION_INSTALLMODE
+  
+  !verbose pop
+
+!macroend
+
+!macro MULTIUSER_FUNCTION_INSTALLMODEPAGE PRE LEAVE
+
+  ;Page functions of Modern UI page
+
+  Function "${PRE}"
+  
+    ${ifnot} ${IsNT}
+      Abort
+    ${endif}
+  
+    ${if} $MultiUser.Privileges != "Power"
+      ${andif} $MultiUser.Privileges != "Admin"
+      Abort
+    ${endif}
+    
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM PRE
+    !insertmacro MUI_HEADER_TEXT_PAGE $(MULTIUSER_TEXT_INSTALLMODE_TITLE) $(MULTIUSER_TEXT_INSTALLMODE_SUBTITLE)
+    
+    nsDialogs::Create 1018
+    Pop $MultiUser.InstallModePage
+
+    ${NSD_CreateLabel} 0u 0u 300u 20u "${MULTIUSER_INSTALLMODEPAGE_TEXT_TOP}"
+    Pop $MultiUser.InstallModePage.Text
+
+    ${NSD_CreateRadioButton} 20u 50u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_ALLUSERS}"
+    Pop $MultiUser.InstallModePage.AllUsers
+    
+    ${NSD_CreateRadioButton} 20u 70u 280u 10u "${MULTIUSER_INSTALLMODEPAGE_TEXT_CURRENTUSER}"
+    Pop $MultiUser.InstallModePage.CurrentUser
+    
+    ${if} $MultiUser.InstallMode == "AllUsers"
+      SendMessage $MultiUser.InstallModePage.AllUsers ${BM_SETCHECK} ${BST_CHECKED} 0
+    ${else}
+      SendMessage $MultiUser.InstallModePage.CurrentUser ${BM_SETCHECK} ${BST_CHECKED} 0
+    ${endif}
+    
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM SHOW
+    nsDialogs::Show
+    
+  FunctionEnd
+
+  Function "${LEAVE}"
+     SendMessage $MultiUser.InstallModePage.AllUsers ${BM_GETCHECK} 0 0 $MultiUser.InstallModePage.ReturnValue
+     
+     ${if} $MultiUser.InstallModePage.ReturnValue = ${BST_CHECKED}
+        Call MultiUser.InstallMode.AllUsers
+     ${else}
+        Call MultiUser.InstallMode.CurrentUser
+     ${endif}
+  
+    !insertmacro MUI_PAGE_FUNCTION_CUSTOM LEAVE
+  FunctionEnd
+
+!macroend
+
+!endif
+
+!verbose pop
+!endif
diff --git a/nsis/getpearch.pl b/nsis/getpearch.pl
new file mode 100644
index 00000000..25155536
--- /dev/null
+++ b/nsis/getpearch.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+#
+# Get the appropriate variables to make an NSIS installer file
+# based on the PE architecture of a specific file
+#
+
+use strict;
+
+my %archnames = (
+    0x01de => 'am33',
+    0x8664 => 'x64',
+    0x01c0 => 'arm32',
+    0x01c4 => 'thumb',
+    0xaa64 => 'arm64',
+    0x0ebc => 'efi',
+    0x014c => 'x86',
+    0x0200 => 'ia64',
+    0x9041 => 'm32r',
+    0x0266 => 'mips16',
+    0x0366 => 'mips',
+    0x0466 => 'mips16',
+    0x01f0 => 'powerpc',
+    0x01f1 => 'powerpc',
+    0x0166 => 'mips',
+    0x01a2 => 'sh3',
+    0x01a3 => 'sh3',
+    0x01a6 => 'sh4',
+    0x01a8 => 'sh5',
+    0x01c2 => 'arm32',
+    0x0169 => 'wcemipsv2'
+);
+
+my ($file) = @ARGV;
+open(my $fh, '<', $file)
+    or die "$0: cannot open file: $file: $!\n";
+
+read($fh, my $mz, 2);
+exit 0 if ($mz ne 'MZ');
+
+exit 0 unless (seek($fh, 0x3c, 0));
+exit 0 unless (read($fh, my $pe_offset, 1) == 1);
+$pe_offset = unpack("C", $pe_offset);
+
+exit 0 unless (seek($fh, $pe_offset, 0));
+read($fh, my $pe, 4);
+exit 0 unless ($pe eq "PE\0\0");
+
+exit 0 unless (read($fh, my $arch, 2) == 2);
+$arch = $archnames{unpack("v", $arch)};
+if (defined($arch)) {
+    print "!define ARCH ${arch}\n";
+}
+
+exit 0 unless (seek($fh, 14, 1));
+exit 0 unless (read($fh, my $auxheaderlen, 2) == 2);
+exit 0 unless (unpack("v", $auxheaderlen) >= 2);
+
+exit 0 unless (seek($fh, 2, 1));
+exit 0 unless (read($fh, my $petype, 2) == 2);
+$petype = unpack("v", $petype);
+if ($petype == 0x010b) {
+    # It is a 32-bit PE32 file
+    print "!define BITS 32\n";
+    print "!define GLOBALINSTDIR \$PROGRAMFILES\n";
+} elsif ($petype == 0x020b) {
+    # It is a 64-bit PE32+ file
+    print "!define BITS 64\n";
+    print "!define GLOBALINSTDIR \$PROGRAMFILES64\n";
+} else {
+    # No idea...
+}
+
+close($fh);
+exit 0;
diff --git a/nsis/nasm-un.ico b/nsis/nasm-un.ico
index 90d338c7..18c92d07 100644
Binary files a/nsis/nasm-un.ico and b/nsis/nasm-un.ico differ
diff --git a/nsis/nasm.ico b/nsis/nasm.ico
index b1a9d63f..37e1c3dc 100644
Binary files a/nsis/nasm.ico and b/nsis/nasm.ico differ
diff --git a/nasm.nsi b/nsis/nasm.nsi
similarity index 90%
rename from nasm.nsi
rename to nsis/nasm.nsi
index 7daea6c8..42411032 100644
--- a/nasm.nsi
+++ b/nsis/nasm.nsi
@@ -27,6 +27,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 !include "version.nsh"
+!include /nonfatal "arch.nsh"
+
 !define PRODUCT_NAME "Netwide Assembler"
 !define PRODUCT_SHORT_NAME "nasm"
 !define PACKAGE_NAME "${PRODUCT_NAME} ${VERSION}"
@@ -37,8 +39,8 @@ SetCompressor lzma
 !define MULTIUSER_EXECUTIONLEVEL Highest
 !define MULTIUSER_MUI
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_INSTALLMODE_INSTDIR "${PRODUCT_SHORT_NAME}"
-!include MultiUser.nsh
+!define MULTIUSER_INSTALLMODE_INSTDIR "NASM"
+!include "MultiUser.nsh"
 
 !insertmacro MULTIUSER_PAGE_INSTALLMODE
 !insertmacro MULTIUSER_INSTALLMODEPAGE_INTERFACE
@@ -48,7 +50,7 @@ SetCompressor lzma
 
 ;Name and file
 Name "${PACKAGE_NAME}"
-OutFile "${PACKAGE_SHORT_NAME}-installer.exe"
+OutFile "../${PACKAGE_SHORT_NAME}-installer-${ARCH}.exe"
 
 ;Get installation folder from registry if available
 InstallDirRegKey HKCU "Software\${PRODUCT_SHORT_NAME}" ""
@@ -65,8 +67,8 @@ Var CmdFailed
 ;--------------------------------
 ;Interface Settings
 Caption "${PACKAGE_SHORT_NAME} installation"
-Icon "nsis/nasm.ico"
-UninstallIcon "nsis/nasm-un.ico"
+Icon "nasm.ico"
+UninstallIcon "nasm-un.ico"
 
 !define MUI_ABORTWARNING
 
@@ -96,10 +98,10 @@ UninstallIcon "nsis/nasm-un.ico"
 Section "NASM" SecNasm
     Sectionin RO
     SetOutPath "$INSTDIR"
-    File "LICENSE"
-    File "nasm.exe"
-    File "ndisasm.exe"
-    File "nsis/nasm.ico"
+    File "../LICENSE"
+    File "../nasm.exe"
+    File "../ndisasm.exe"
+    File "nasm.ico"
 
     ;Store installation folder
     WriteRegStr HKCU "Software\${PRODUCT_SHORT_NAME}" "" $INSTDIR
@@ -135,30 +137,27 @@ skip:
 SectionEnd
 
 Section "RDOFF" SecRdoff
-    CreateDirectory "$INSTDIR\rdoff"
-    SetOutPath "$INSTDIR\rdoff"
-    File "rdoff/ldrdf.exe"
-    File "rdoff/rdf2bin.exe"
-    File "rdoff/rdf2com.exe"
-    File "rdoff/rdf2ith.exe"
-    File "rdoff/rdf2ihx.exe"
-    File "rdoff/rdf2srec.exe"
-    File "rdoff/rdfdump.exe"
-    File "rdoff/rdflib.exe"
-    File "rdoff/rdx.exe"
+    File "../rdoff/ldrdf.exe"
+    File "../rdoff/rdf2bin.exe"
+    File "../rdoff/rdf2com.exe"
+    File "../rdoff/rdf2ith.exe"
+    File "../rdoff/rdf2ihx.exe"
+    File "../rdoff/rdf2srec.exe"
+    File "../rdoff/rdfdump.exe"
+    File "../rdoff/rdflib.exe"
 SectionEnd
 
 Section "Manual" SecManual
     SetOutPath "$INSTDIR"
-    File "doc/nasmdoc.pdf"
+    File "../doc/nasmdoc.pdf"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Manual.lnk" "$INSTDIR\nasmdoc.pdf"
 SectionEnd
 
 Section "VS8 integration" SecVS8
-    CreateDirectory "$INSTDIR\contrib\VSrules"
-    SetOutPath "$INSTDIR\contrib\VSrules"
-    File "contrib/VSrules/nasm.README"
-    File "contrib/VSrules/nasm.rules"
+    CreateDirectory "$INSTDIR\VSrules"
+    SetOutPath "$INSTDIR\VSrules"
+    File "../contrib/VSrules/nasm.README"
+    File "../contrib/VSrules/nasm.rules"
 SectionEnd
 
 ;--------------------------------
diff --git a/output/outaout.c b/output/outaout.c
index 5a125408..be566e07 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -630,7 +630,7 @@ static void aout_out(int32_t segto, const void *data,
             sbss.len += size;
     } else if (type == OUT_RAWDATA) {
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         aout_sect_write(s, data, size);
     } else if (type == OUT_ADDRESS) {
         int asize = abs((int)size);
@@ -682,7 +682,7 @@ static void aout_out(int32_t segto, const void *data,
         aout_sect_write(s, mydata, asize);
     } else if (type == OUT_REL2ADR) {
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL2ADR");
+            nasm_panic(0, "intra-segment OUT_REL2ADR");
         if (segment != NO_SEG && segment % 2) {
             nasm_error(ERR_NONFATAL, "a.out format does not support"
                   " segment base references");
@@ -712,7 +712,7 @@ static void aout_out(int32_t segto, const void *data,
         aout_sect_write(s, mydata, 2L);
     } else if (type == OUT_REL4ADR) {
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment != NO_SEG && segment % 2) {
             nasm_error(ERR_NONFATAL, "a.out format does not support"
                   " segment base references");
diff --git a/output/outas86.c b/output/outas86.c
index ac3628f7..3dc17c30 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -343,7 +343,7 @@ static void as86_out(int32_t segto, const void *data,
             bsslen += size;
     } else if (type == OUT_RAWDATA) {
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         as86_sect_write(s, data, size);
         as86_add_piece(s, 0, 0L, 0L, size, 0);
     } else if (type == OUT_ADDRESS) {
@@ -364,7 +364,7 @@ static void as86_out(int32_t segto, const void *data,
         }
     } else if (type == OUT_REL2ADR) {
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL2ADR");
+            nasm_panic(0, "intra-segment OUT_REL2ADR");
         if (segment != NO_SEG) {
             if (segment % 2) {
                 nasm_error(ERR_NONFATAL, "as86 format does not support"
@@ -377,7 +377,7 @@ static void as86_out(int32_t segto, const void *data,
         }
     } else if (type == OUT_REL4ADR) {
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment != NO_SEG) {
             if (segment % 2) {
                 nasm_error(ERR_NONFATAL, "as86 format does not support"
@@ -518,7 +518,7 @@ static void as86_set_rsize(int size)
             fputc(0x03, ofile);
             break;
         default:
-            nasm_error(ERR_PANIC, "bizarre relocation size %d", size);
+            nasm_panic(0, "bizarre relocation size %d", size);
 	    break;
         }
     }
diff --git a/output/outbin.c b/output/outbin.c
index 5f993467..e4e4e1e1 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -270,7 +270,7 @@ static void bin_cleanup(int debuginfo)
         if (s->flags & (START_DEFINED | ALIGN_DEFINED | FOLLOWS_DEFINED)) {     /* Check for a mixture of real and virtual section attributes. */
             if (s->flags & (VSTART_DEFINED | VALIGN_DEFINED |
 			    VFOLLOWS_DEFINED))
-                nasm_error(ERR_FATAL|ERR_NOFILE,
+                nasm_fatal(ERR_NOFILE,
                       "cannot mix real and virtual attributes"
                       " in nobits section (%s)", s->name);
             /* Real and virtual attributes mean the same thing for nobits sections. */
@@ -341,11 +341,11 @@ static void bin_cleanup(int debuginfo)
              s && strcmp(s->name, g->follows);
              sp = &s->next, s = s->next) ;
         if (!s)
-            nasm_error(ERR_FATAL|ERR_NOFILE, "section %s follows an invalid or"
+            nasm_fatal(ERR_NOFILE, "section %s follows an invalid or"
                   " unknown section (%s)", g->name, g->follows);
         if (s->next && (s->next->flags & FOLLOWS_DEFINED) &&
             !strcmp(s->name, s->next->follows))
-            nasm_error(ERR_FATAL|ERR_NOFILE, "sections %s and %s can't both follow"
+            nasm_fatal(ERR_NOFILE, "sections %s and %s can't both follow"
                   " section %s", g->name, s->next->name, s->name);
         /* Find the end of the current follows group (gs). */
         for (gsp = &g->next, gs = g->next;
@@ -389,7 +389,7 @@ static void bin_cleanup(int debuginfo)
 	if (sections->flags & START_DEFINED) {
             /* Make sure this section doesn't begin before the origin. */
             if (sections->start < origin)
-                nasm_error(ERR_FATAL|ERR_NOFILE, "section %s begins"
+                nasm_fatal(ERR_NOFILE, "section %s begins"
                       " before program origin", sections->name);
 	} else if (sections->flags & ALIGN_DEFINED) {
             sections->start = ALIGN(origin, sections->align);
@@ -445,13 +445,13 @@ static void bin_cleanup(int debuginfo)
         /* Check for section overlap. */
         if (s) {
 	    if (s->start < origin)
-		nasm_error(ERR_FATAL|ERR_NOFILE, "section %s beings before program origin",
+		nasm_fatal(ERR_NOFILE, "section %s beings before program origin",
 		      s->name);
 	    if (g->start > s->start)
-                nasm_error(ERR_FATAL|ERR_NOFILE, "sections %s ~ %s and %s overlap!",
+                nasm_fatal(ERR_NOFILE, "sections %s ~ %s and %s overlap!",
                       gs->name, g->name, s->name);
             if (pend > s->start)
-                nasm_error(ERR_FATAL|ERR_NOFILE, "sections %s and %s overlap!",
+                nasm_fatal(ERR_NOFILE, "sections %s and %s overlap!",
                       g->name, s->name);
         }
         /* Remember this section as the latest >0 length section. */
@@ -480,7 +480,7 @@ static void bin_cleanup(int debuginfo)
                 for (s = sections; s && strcmp(g->vfollows, s->name);
                      s = s->next) ;
                 if (!s)
-                    nasm_error(ERR_FATAL|ERR_NOFILE,
+                    nasm_fatal(ERR_NOFILE,
                           "section %s vfollows unknown section (%s)",
                           g->name, g->vfollows);
             } else if (g->prev != NULL)
@@ -519,7 +519,7 @@ static void bin_cleanup(int debuginfo)
         }
     }
     if (h)
-        nasm_error(ERR_FATAL|ERR_NOFILE, "circular vfollows path detected");
+        nasm_fatal(ERR_NOFILE, "circular vfollows path detected");
 
 #ifdef DEBUG
     nasm_error(ERR_DEBUG,
@@ -748,7 +748,7 @@ static void bin_out(int32_t segto, const void *data,
     /* Find the segment we are targeting. */
     s = find_section_by_index(segto);
     if (!s)
-        nasm_error(ERR_PANIC, "code directed to nonexistent segment?");
+        nasm_panic(0, "code directed to nonexistent segment?");
 
     /* "Smart" section-type adaptation code. */
     if (!(s->flags & TYPE_DEFINED)) {
diff --git a/output/outcoff.c b/output/outcoff.c
index 3daccb7e..3265b617 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -583,7 +583,7 @@ static void coff_out(int32_t segto, const void *data,
     if (!s) {
         int tempint;            /* ignored */
         if (segto != coff_section_names(".text", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in COFF driver");
+            nasm_panic(0, "strange segment conditions in COFF driver");
         else
             s = coff_sects[coff_nsects - 1];
     }
@@ -626,7 +626,7 @@ static void coff_out(int32_t segto, const void *data,
             s->len += size;
     } else if (type == OUT_RAWDATA) {
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         coff_sect_write(s, data, size);
     } else if (type == OUT_ADDRESS) {
         int asize = abs((int)size);
@@ -674,7 +674,7 @@ static void coff_out(int32_t segto, const void *data,
               " relocations");
     } else if (type == OUT_REL4ADR) {
         if (segment == segto && !(win64))  /* Acceptable for RIP-relative */
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         else if (segment == NO_SEG && win32)
             nasm_error(ERR_NONFATAL, "Win32 COFF does not correctly support"
                   " relative references to absolute addresses");
@@ -875,7 +875,7 @@ static inline void coff_adjust_relocs(struct coff_Section *s)
     else
     {
         if (ofmt == &of_coff)
-            nasm_error(ERR_FATAL,
+            nasm_fatal(0,
                        "Too many relocations (%d) for section `%s'",
                        s->nrelocs, s->name);
     }
diff --git a/output/outelf32.c b/output/outelf32.c
index 455f2b98..3944cd44 100644
--- a/output/outelf32.c
+++ b/output/outelf32.c
@@ -421,7 +421,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
             /* we have to be sure at least text section is there */
             int tempint;
             if (segment != elf_section_names(".text", 2, &tempint))
-                nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+                nasm_panic(0, "strange segment conditions in ELF driver");
         }
         for (i = 0; i < nsects; i++) {
             if (segment == sects[i]->index) {
@@ -684,7 +684,7 @@ static void elf_out(int32_t segto, const void *data,
     if (!s) {
         int tempint;            /* ignored */
         if (segto != elf_section_names(".text", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+            nasm_panic(0, "strange segment conditions in ELF driver");
         else {
             s = sects[nsects - 1];
             i = nsects - 1;
@@ -721,7 +721,7 @@ static void elf_out(int32_t segto, const void *data,
 
     case OUT_RAWDATA:
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         elf_sect_write(s, data, size);
 	break;
 
@@ -844,7 +844,7 @@ static void elf_out(int32_t segto, const void *data,
 
     case OUT_REL4ADR:
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment != NO_SEG && segment % 2) {
             nasm_error(ERR_NONFATAL, "ELF format does not support"
                   " segment base references");
diff --git a/output/outelf64.c b/output/outelf64.c
index 57be311b..a8cefe17 100644
--- a/output/outelf64.c
+++ b/output/outelf64.c
@@ -426,7 +426,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
             /* we have to be sure at least text section is there */
             int tempint;
             if (segment != elf_section_names(".text", 2, &tempint))
-                nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+                nasm_panic(0, "strange segment conditions in ELF driver");
         }
         for (i = 0; i < nsects; i++) {
             if (segment == sects[i]->index) {
@@ -700,7 +700,7 @@ static void elf_out(int32_t segto, const void *data,
     if (!s) {
         int tempint;            /* ignored */
         if (segto != elf_section_names(".text", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+            nasm_panic(0, "strange segment conditions in ELF driver");
         else {
             s = sects[nsects - 1];
             i = nsects - 1;
@@ -736,7 +736,7 @@ static void elf_out(int32_t segto, const void *data,
 
     case OUT_RAWDATA:
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         elf_sect_write(s, data, size);
 	break;
 
@@ -773,7 +773,7 @@ static void elf_out(int32_t segto, const void *data,
                     elf_add_reloc(s, segment, addr, R_X86_64_64);
                     break;
                 default:
-                    nasm_error(ERR_PANIC, "internal error elf64-hpa-871");
+                    nasm_panic(0, "internal error elf64-hpa-871");
                     break;
                 }
                 addr = 0;
@@ -841,7 +841,7 @@ static void elf_out(int32_t segto, const void *data,
                     addr = 0;
                     break;
                 default:
-                    nasm_error(ERR_PANIC, "internal error elf64-hpa-903");
+                    nasm_panic(0, "internal error elf64-hpa-903");
                     break;
                 }
             } else if (wrt == elf_plt_sect + 1) {
@@ -869,7 +869,7 @@ static void elf_out(int32_t segto, const void *data,
     rel12adr:
         addr = *(int64_t *)data - size;
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL1ADR");
+            nasm_panic(0, "intra-segment OUT_REL1ADR");
         if (segment == NO_SEG) {
             /* Do nothing */
         } else if (segment % 2) {
@@ -890,7 +890,7 @@ static void elf_out(int32_t segto, const void *data,
     case OUT_REL4ADR:
         addr = *(int64_t *)data - size;
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment == NO_SEG) {
             /* Do nothing */
         } else if (segment % 2) {
@@ -928,7 +928,7 @@ static void elf_out(int32_t segto, const void *data,
     case OUT_REL8ADR:
         addr = *(int64_t *)data - size;
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL8ADR");
+            nasm_panic(0, "intra-segment OUT_REL8ADR");
         if (segment == NO_SEG) {
             /* Do nothing */
         } else if (segment % 2) {
diff --git a/output/outelfx32.c b/output/outelfx32.c
index 5896af3b..4dc795a9 100644
--- a/output/outelfx32.c
+++ b/output/outelfx32.c
@@ -426,7 +426,7 @@ static void elf_deflabel(char *name, int32_t segment, int64_t offset,
             /* we have to be sure at least text section is there */
             int tempint;
             if (segment != elf_section_names(".text", 2, &tempint))
-                nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+                nasm_panic(0, "strange segment conditions in ELF driver");
         }
         for (i = 0; i < nsects; i++) {
             if (segment == sects[i]->index) {
@@ -700,7 +700,7 @@ static void elf_out(int32_t segto, const void *data,
     if (!s) {
         int tempint;            /* ignored */
         if (segto != elf_section_names(".text", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in ELF driver");
+            nasm_panic(0, "strange segment conditions in ELF driver");
         else {
             s = sects[nsects - 1];
             i = nsects - 1;
@@ -736,7 +736,7 @@ static void elf_out(int32_t segto, const void *data,
 
     case OUT_RAWDATA:
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
         elf_sect_write(s, data, size);
 	break;
 
@@ -773,7 +773,7 @@ static void elf_out(int32_t segto, const void *data,
                     elf_add_reloc(s, segment, addr, R_X86_64_64);
                     break;
                 default:
-                    nasm_error(ERR_PANIC, "internal error elfx32-hpa-871");
+                    nasm_panic(0, "internal error elfx32-hpa-871");
                     break;
                 }
                 addr = 0;
@@ -831,7 +831,7 @@ static void elf_out(int32_t segto, const void *data,
                     addr = 0;
                     break;
                 default:
-                    nasm_error(ERR_PANIC, "internal error elfx32-hpa-903");
+                    nasm_panic(0, "internal error elfx32-hpa-903");
                     break;
                 }
             } else if (wrt == elf_plt_sect + 1) {
@@ -859,7 +859,7 @@ static void elf_out(int32_t segto, const void *data,
     rel12adr:
         addr = *(int64_t *)data - size;
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL1ADR");
+            nasm_panic(0, "intra-segment OUT_REL1ADR");
         if (segment == NO_SEG) {
             /* Do nothing */
         } else if (segment % 2) {
@@ -880,7 +880,7 @@ static void elf_out(int32_t segto, const void *data,
     case OUT_REL4ADR:
         addr = *(int64_t *)data - size;
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment == NO_SEG) {
             /* Do nothing */
         } else if (segment % 2) {
diff --git a/output/outieee.c b/output/outieee.c
index 05624657..b460bbb3 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -419,7 +419,7 @@ static void ieee_out(int32_t segto, const void *data,
     if (!any_segs) {
         int tempint;            /* ignored */
         if (segto != ieee_segment("__NASMDEFSEG", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in IEEE driver");
+            nasm_panic(0, "strange segment conditions in IEEE driver");
     }
 
     /*
@@ -429,7 +429,7 @@ static void ieee_out(int32_t segto, const void *data,
         if (seg->index == segto)
             break;
     if (!seg)
-        nasm_error(ERR_PANIC, "code directed to nonexistent segment?");
+        nasm_panic(0, "code directed to nonexistent segment?");
 
     if (type == OUT_RAWDATA) {
         ucdata = data;
@@ -535,7 +535,7 @@ static void ieee_write_fixup(int32_t segment, int32_t wrt,
                     }
 
                 } else
-                    nasm_error(ERR_PANIC,
+                    nasm_panic(0,
                           "unrecognised WRT value in ieee_write_fixup");
             } else
                 nasm_error(ERR_NONFATAL, "target of WRT must be a section ");
@@ -577,7 +577,7 @@ static void ieee_write_fixup(int32_t segment, int32_t wrt,
                  */
                 if (eb) {
                     if (realtype == OUT_REL2ADR || realtype == OUT_REL4ADR) {
-                        nasm_error(ERR_PANIC,
+                        nasm_panic(0,
                               "Segment of a rel not supported in ieee_write_fixup");
                     } else {
                         /* If we want the segment */
@@ -588,7 +588,7 @@ static void ieee_write_fixup(int32_t segment, int32_t wrt,
 
                 } else
                     /* If we get here the seg value doesn't make sense */
-                    nasm_error(ERR_PANIC,
+                    nasm_panic(0,
                           "unrecognised segment value in ieee_write_fixup");
             }
 
@@ -643,7 +643,7 @@ static void ieee_write_fixup(int32_t segment, int32_t wrt,
 
                 } else
                     /* If we get here the seg value doesn't make sense */
-                    nasm_error(ERR_PANIC,
+                    nasm_panic(0,
                           "unrecognised segment value in ieee_write_fixup");
             }
         }
@@ -994,7 +994,7 @@ static void ieee_write_file(int debuginfo)
             if (seg->index == ieee_entry_seg)
                 break;
         if (!seg)
-            nasm_error(ERR_PANIC, "Start address records are incorrect");
+            nasm_panic(0, "Start address records are incorrect");
         else
             ieee_putascii("ASG,R%X,%lX,+.\n", seg->ieee_index,
                           ieee_entry_ofs);
@@ -1357,7 +1357,7 @@ static void dbgls_linnum(const char *lnfname, int32_t lineno, int32_t segto)
     if (!any_segs) {
         int tempint;            /* ignored */
         if (segto != ieee_segment("__NASMDEFSEG", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in OBJ driver");
+            nasm_panic(0, "strange segment conditions in OBJ driver");
     }
 
     /*
@@ -1367,7 +1367,7 @@ static void dbgls_linnum(const char *lnfname, int32_t lineno, int32_t segto)
         if (seg->index == segto)
             break;
     if (!seg)
-        nasm_error(ERR_PANIC, "lineno directed to nonexistent segment?");
+        nasm_panic(0, "lineno directed to nonexistent segment?");
 
     for (fn = fnhead; fn; fn = fn->next) {
         if (!nasm_stricmp(lnfname, fn->name))
diff --git a/output/outmacho.c b/output/outmacho.c
index 5fbc9a9c..c4bdc015 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -1139,7 +1139,7 @@ static void macho_calculate_sizes (void)
     }
 
     if (seg_nsects > MAX_SECT) {
-	nasm_error(ERR_FATAL, "MachO output is limited to %d sections\n",
+	nasm_fatal(0, "MachO output is limited to %d sections\n",
 		   MAX_SECT);
     }
 
diff --git a/output/outobj.c b/output/outobj.c
index 433fc2a2..8eb5422b 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -840,7 +840,7 @@ static void obj_deflabel(char *name, int32_t segment,
     if (!any_segs && segment == first_seg) {
         int tempint;            /* ignored */
         if (segment != obj_segment("__NASMDEFSEG", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in OBJ driver");
+            nasm_panic(0, "strange segment conditions in OBJ driver");
     }
 
     for (seg = seghead; seg && is_global; seg = seg->next)
@@ -1046,7 +1046,7 @@ static void obj_out(int32_t segto, const void *data,
     if (!any_segs) {
         int tempint;            /* ignored */
         if (segto != obj_segment("__NASMDEFSEG", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in OBJ driver");
+            nasm_panic(0, "strange segment conditions in OBJ driver");
     }
 
     /*
@@ -1056,7 +1056,7 @@ static void obj_out(int32_t segto, const void *data,
         if (seg->index == segto)
             break;
     if (!seg)
-        nasm_error(ERR_PANIC, "code directed to nonexistent segment?");
+        nasm_panic(0, "code directed to nonexistent segment?");
 
     orp = seg->orp;
     orp->parm[0] = seg->currentpos;
@@ -1193,7 +1193,7 @@ static void obj_write_fixup(ObjRecord * orp, int bytes,
         locat = FIX_16_SELECTOR;
         seg--;
         if (bytes != 2)
-            nasm_error(ERR_PANIC, "OBJ: 4-byte segment base fixup got"
+            nasm_panic(0, "OBJ: 4-byte segment base fixup got"
                   " through sanity check");
     } else {
         base = false;
@@ -1239,7 +1239,7 @@ static void obj_write_fixup(ObjRecord * orp, int bytes,
             if (eb)
                 method = 6, e = eb->exts[i], tidx = e->index;
             else
-                nasm_error(ERR_PANIC,
+                nasm_panic(0,
                       "unrecognised segment value in obj_write_fixup");
         }
     }
@@ -1298,7 +1298,7 @@ static void obj_write_fixup(ObjRecord * orp, int bytes,
                 if (eb)
                     method |= 0x20, fidx = eb->exts[i]->index;
                 else
-                    nasm_error(ERR_PANIC,
+                    nasm_panic(0,
                           "unrecognised WRT value in obj_write_fixup");
             }
         }
@@ -1447,7 +1447,7 @@ static int32_t obj_segment(char *name, int pass, int *bits)
                         if (!strcmp(grp->name, "FLAT"))
                             break;
                     if (!grp)
-                        nasm_error(ERR_PANIC, "failure to define FLAT?!");
+                        nasm_panic(0, "failure to define FLAT?!");
                 }
                 seg->grp = grp;
             } else if (!nasm_strnicmp(p, "class=", 6))
@@ -2457,7 +2457,7 @@ static void dbgbi_linnum(const char *lnfname, int32_t lineno, int32_t segto)
     if (!any_segs) {
         int tempint;            /* ignored */
         if (segto != obj_segment("__NASMDEFSEG", 2, &tempint))
-            nasm_error(ERR_PANIC, "strange segment conditions in OBJ driver");
+            nasm_panic(0, "strange segment conditions in OBJ driver");
     }
 
     /*
@@ -2467,7 +2467,7 @@ static void dbgbi_linnum(const char *lnfname, int32_t lineno, int32_t segto)
         if (seg->index == segto)
             break;
     if (!seg)
-        nasm_error(ERR_PANIC, "lineno directed to nonexistent segment?");
+        nasm_panic(0, "lineno directed to nonexistent segment?");
 
 /*    for (fn = fnhead; fn; fn = fnhead->next) */
     for (fn = fnhead; fn; fn = fn->next)        /* fbk - Austin Lunnen - John Fine */
diff --git a/output/outrdf2.c b/output/outrdf2.c
index 235d7139..a6003821 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -145,7 +145,7 @@ static void rdf2_init(void)
     segdata = seg_alloc();
     segbss = seg_alloc();
     if (segtext != 0 || segdata != 2 || segbss != 4)
-        nasm_error(ERR_PANIC,
+        nasm_panic(0,
               "rdf segment numbers not allocated as expected (%d,%d,%d)",
               segtext, segdata, segbss);
     bsslength = 0;
@@ -227,7 +227,7 @@ static int32_t rdf2_section_names(char *name, int pass, int *bits)
         code = 3;
     }
     if (nsegments == RDF_MAXSEGS) {
-        nasm_error(ERR_FATAL, "reached compiled-in maximum segment limit (%d)",
+        nasm_fatal(0, "reached compiled-in maximum segment limit (%d)",
               RDF_MAXSEGS);
         return NO_SEG;
     }
@@ -235,7 +235,7 @@ static int32_t rdf2_section_names(char *name, int pass, int *bits)
     segments[nsegments].segname = nasm_strdup(name);
     i = seg_alloc();
     if (i % 2 != 0)
-        nasm_error(ERR_PANIC, "seg_alloc() returned odd number");
+        nasm_panic(0, "seg_alloc() returned odd number");
     segments[nsegments].segnumber = i >> 1;
     segments[nsegments].segtype = code;
     segments[nsegments].segreserved = reserved;
@@ -497,7 +497,7 @@ static void membufwrite(int segment, const void *data, int bytes)
             break;
     }
     if (i == nsegments)
-        nasm_error(ERR_PANIC, "can't find segment %d", segment);
+        nasm_panic(0, "can't find segment %d", segment);
 
     if (bytes < 0) {
         b = buf;
@@ -520,7 +520,7 @@ static int getsegmentlength(int segment)
             break;
     }
     if (i == nsegments)
-        nasm_error(ERR_PANIC, "can't find segment %d", segment);
+        nasm_panic(0, "can't find segment %d", segment);
 
     return segments[i].seglength;
 }
@@ -577,7 +577,7 @@ static void rdf2_out(int32_t segto, const void *data,
                 membufwrite(segto, databuf, 1);
     } else if (type == OUT_RAWDATA) {
         if (segment != NO_SEG)
-            nasm_error(ERR_PANIC, "OUT_RAWDATA with other than NO_SEG");
+            nasm_panic(0, "OUT_RAWDATA with other than NO_SEG");
 
         membufwrite(segto, data, size);
     } else if (type == OUT_ADDRESS) {
@@ -606,7 +606,7 @@ static void rdf2_out(int32_t segto, const void *data,
         membufwrite(segto, databuf, asize);
     } else if (type == OUT_REL2ADR) {
         if (segment == segto)
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL2ADR");
+            nasm_panic(0, "intra-segment OUT_REL2ADR");
 
         rr.reclen = 8;
         rr.offset = getsegmentlength(segto);    /* current offset */
@@ -638,9 +638,9 @@ static void rdf2_out(int32_t segto, const void *data,
         membufwrite(segto, &rr.offset, -2);
     } else if (type == OUT_REL4ADR) {
         if ((segment == segto) && (globalbits != 64))
-            nasm_error(ERR_PANIC, "intra-segment OUT_REL4ADR");
+            nasm_panic(0, "intra-segment OUT_REL4ADR");
         if (segment != NO_SEG && segment % 2) {
-            nasm_error(ERR_PANIC, "erm... 4 byte segment base ref?");
+            nasm_panic(0, "erm... 4 byte segment base ref?");
         }
 
         rr.type = RDFREC_RELOC; /* type signature */
diff --git a/parser.c b/parser.c
index c5d6050f..ed037812 100644
--- a/parser.c
+++ b/parser.c
@@ -101,7 +101,7 @@ static int prefix_slot(int prefix)
     case P_VEX2:
         return PPS_VEX;
     default:
-        nasm_error(ERR_PANIC, "Invalid value %d passed to prefix_slot()", prefix);
+        nasm_panic(0, "Invalid value %d passed to prefix_slot()", prefix);
         return -1;
     }
 }
diff --git a/preproc.c b/preproc.c
index fe62428f..edc127a4 100644
--- a/preproc.c
+++ b/preproc.c
@@ -4884,7 +4884,7 @@ static char *pp_getline(void)
     Token *tline;
 
     real_verror = nasm_set_verror(pp_verror);
-    
+
     while (1) {
         /*
          * Fetch a tokenized line, either from the macro-expansion
@@ -5005,7 +5005,7 @@ static char *pp_getline(void)
                 fclose(i->fp);
                 if (i->conds) {
                     /* nasm_error can't be conditionally suppressed */
-                    nasm_error(ERR_FATAL,
+                    nasm_fatal(0,
                                "expected `%%endif' before end of file");
                 }
                 /* only set line and file name if there's a next node */
@@ -5100,7 +5100,7 @@ done:
 static void pp_cleanup(int pass)
 {
     real_verror = nasm_set_verror(pp_verror);
-    
+
     if (defining) {
         if (defining->name) {
             nasm_error(ERR_NONFATAL,
@@ -5115,7 +5115,7 @@ static void pp_cleanup(int pass)
     }
 
     nasm_set_verror(real_verror);
-    
+
     while (cstk)
         ctx_pop();
     free_macros();
@@ -5185,7 +5185,7 @@ static void pp_pre_define(char *definition)
     char *equals;
 
     real_verror = nasm_set_verror(pp_verror);
-    
+
     equals = strchr(definition, '=');
     space = new_Token(NULL, TOK_WHITESPACE, NULL, 0);
     def = new_Token(space, TOK_PREPROC_ID, "%define", 0);
diff --git a/test/cv8struc.asm b/test/cv8struc.asm
new file mode 100644
index 00000000..83fce799
--- /dev/null
+++ b/test/cv8struc.asm
@@ -0,0 +1,8 @@
+struc A_STRUC
+  ._a: resw 1
+endstruc
+
+a_struc:
+  istruc A_STRUC
+  at A_STRUC._a, dw 1
+  iend
diff --git a/version b/version
index 3e162f02..e55755c6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.12
+2.12.01rc1