diff --git a/src/arch/amd64.c b/src/arch/amd64.c
index 245b897..7e41622 100644
--- a/src/arch/amd64.c
+++ b/src/arch/amd64.c
@@ -58,7 +58,7 @@ static AsmArchRegister const _amd64_registers[] =
 #include "i386.reg"
 #include "i686.reg"
 #include "amd64.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/arm.c b/src/arch/arm.c
index d020adf..d4981df 100644
--- a/src/arch/arm.c
+++ b/src/arch/arm.c
@@ -52,7 +52,7 @@ static AsmArchDefinition const _arm_definition =
 static AsmArchRegister const _arm_registers[] =
 {
 #include "arm.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/dalvik.c b/src/arch/dalvik.c
index 1249e98..d425745 100644
--- a/src/arch/dalvik.c
+++ b/src/arch/dalvik.c
@@ -72,7 +72,7 @@ static AsmArchDefinition const _dalvik_definition =
 static AsmArchRegister const _dalvik_registers[] =
 {
 #include "dalvik.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/i386.c b/src/arch/i386.c
index 768c7f3..8cb2c6e 100644
--- a/src/arch/i386.c
+++ b/src/arch/i386.c
@@ -57,7 +57,7 @@ static AsmArchDefinition _i386_definition =
 static AsmArchRegister const _i386_registers[] =
 {
 #include "i386.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/i386_real.c b/src/arch/i386_real.c
index 87d9a2e..59a8d81 100644
--- a/src/arch/i386_real.c
+++ b/src/arch/i386_real.c
@@ -54,7 +54,7 @@ static AsmArchDefinition const _i386_real_definition =
 static AsmArchRegister const _i386_real_registers[] =
 {
 #include "i386.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/i486.c b/src/arch/i486.c
index aa377db..179c026 100644
--- a/src/arch/i486.c
+++ b/src/arch/i486.c
@@ -57,7 +57,7 @@ static AsmArchDefinition const _i486_definition =
 static AsmArchRegister const _i486_registers[] =
 {
 #include "i386.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/i586.c b/src/arch/i586.c
index b253079..88d0715 100644
--- a/src/arch/i586.c
+++ b/src/arch/i586.c
@@ -57,7 +57,7 @@ static AsmArchDefinition const _i586_definition =
 static AsmArchRegister const _i586_registers[] =
 {
 #include "i386.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/i686.c b/src/arch/i686.c
index effae04..9409a81 100644
--- a/src/arch/i686.c
+++ b/src/arch/i686.c
@@ -59,7 +59,7 @@ static AsmArchRegister const _i686_registers[] =
 {
 #include "i386.reg"
 #include "i686.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/java.c b/src/arch/java.c
index a77c3ec..7b2b863 100644
--- a/src/arch/java.c
+++ b/src/arch/java.c
@@ -39,7 +39,7 @@ static AsmArchDefinition const _java_definition =
 
 static AsmArchRegister const _java_registers[] =
 {
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 
 #define OP1F		(8 << AOD_SIZE)
diff --git a/src/arch/mips.c b/src/arch/mips.c
index fd5b583..bd1ddd5 100644
--- a/src/arch/mips.c
+++ b/src/arch/mips.c
@@ -39,7 +39,7 @@ static AsmArchDefinition const _mips_definition =
 static AsmArchRegister const _mips_registers[] =
 {
 #include "mips.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/null.reg b/src/arch/null.reg
new file mode 100644
index 0000000..56043f7
--- /dev/null
+++ b/src/arch/null.reg
@@ -0,0 +1,2 @@
+/* $Id$ */
+	{ NULL,	0x0, 0x0, 0x0, NULL }
diff --git a/src/arch/project.conf b/src/arch/project.conf
index 98cbb85..fa3b296 100644
--- a/src/arch/project.conf
+++ b/src/arch/project.conf
@@ -3,7 +3,7 @@ cppflags_force=-I ../../include
 cflags_force=-W `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -fPIC -pedantic
 ldflags_force=-W `pkg-config --libs libSystem`
-dist=Makefile,amd64.ins,amd64.reg,arm.h,arm.ins,arm.reg,common.ins,dalvik.ins,dalvik.reg,i386.h,i386.ins,i386.reg,i486.ins,i586.ins,i686.ins,i686.reg,mips.h,mips.ins,mips.reg,null.ins,sparc.h,sparc.ins,sparc.reg,yasep.h,yasep.ins,yasep.reg
+dist=Makefile,amd64.ins,amd64.reg,arm.h,arm.ins,arm.reg,common.ins,dalvik.ins,dalvik.reg,i386.h,i386.ins,i386.reg,i486.ins,i586.ins,i686.ins,i686.reg,mips.h,mips.ins,mips.reg,null.ins,null.reg,sparc.h,sparc.ins,sparc.reg,yasep.h,yasep.ins,yasep.reg
 
 [amd64]
 type=plugin
diff --git a/src/arch/sparc.c b/src/arch/sparc.c
index 974db2a..19c1548 100644
--- a/src/arch/sparc.c
+++ b/src/arch/sparc.c
@@ -32,7 +32,7 @@ static AsmArchDefinition const _sparc_definition =
 static AsmArchRegister const _sparc_registers[] =
 {
 #include "sparc.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/sparc64.c b/src/arch/sparc64.c
index d712123..84cdb9c 100644
--- a/src/arch/sparc64.c
+++ b/src/arch/sparc64.c
@@ -32,7 +32,7 @@ static AsmArchDefinition const _sparc64_definition =
 static AsmArchRegister const _sparc64_registers[] =
 {
 #include "sparc.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/template.c b/src/arch/template.c
index e0a649e..8f7db2a 100644
--- a/src/arch/template.c
+++ b/src/arch/template.c
@@ -32,7 +32,7 @@ static AsmArchDefinition const _template_definition =
 	{ "" # name, size, id, flags, description },
 static AsmArchRegister const _template_registers[] =
 {
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG
 
diff --git a/src/arch/yasep.c b/src/arch/yasep.c
index f633ba1..3f89c9e 100644
--- a/src/arch/yasep.c
+++ b/src/arch/yasep.c
@@ -40,7 +40,7 @@ static AsmArchDefinition const _yasep_definition =
 static AsmArchRegister const _yasep_registers[] =
 {
 #include "yasep.reg"
-	{ NULL, 0, 0, 0, NULL }
+#include "null.reg"
 };
 #undef REG