diff --git a/xaos-3.5-fix-conflicting-register-types.patch b/xaos-3.5-fix-conflicting-register-types.patch
new file mode 100644
index 0000000..76d8a0e
--- /dev/null
+++ b/xaos-3.5-fix-conflicting-register-types.patch
@@ -0,0 +1,22 @@
+--- xaos-3.5/src/engine/zoom.c.proto	2009-07-18 08:50:31.000000000 +0900
++++ xaos-3.5/src/engine/zoom.c	2012-08-01 15:41:05.202987708 +0900
+@@ -933,6 +933,7 @@
+ }
+ 
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static /*INLINE */ void
+ moveoldpoints(void /*@unused@ */ *data1,
+ 	      struct taskinfo /*@unused@ */ *task,
+--- xaos-3.5/src/engine/zoomd.c.proto	2009-07-18 08:50:31.000000000 +0900
++++ xaos-3.5/src/engine/zoomd.c	2012-08-01 15:39:38.563341293 +0900
+@@ -280,7 +280,8 @@
+ #endif
+ #undef bpp1
+ 
+-static INLINE void fillline(int line)
++REGISTERS(0)
++static void fillline(int line)
+ {
+     register unsigned char *RESTRICT vbuff = cimage.currlines[line];
+     CONST struct filltable *RESTRICT table = (struct filltable *) tmpdata;
diff --git a/xaos.spec b/xaos.spec
index e745854..577cecf 100644
--- a/xaos.spec
+++ b/xaos.spec
@@ -1,6 +1,6 @@
 Name:           xaos
 Version:        3.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A fast, portable real-time interactive fractal zoomer
 
 Group:          Applications/Multimedia
@@ -8,6 +8,7 @@ License:        GPLv2+
 URL:            http://xaos.sourceforge.net
 Source0:        http://surfnet.dl.sourceforge.net/sourceforge/xaos/xaos-%{version}.tar.gz
 Source1:	xaos.png
+Patch0:	xaos-3.5-fix-conflicting-register-types.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  slang-devel
 BuildRequires:	zlib-devel
@@ -42,6 +43,7 @@ on-the-fly plane switching.
 
 %prep
 %setup0 -q 
+%patch0 -p1 -b .proto
 # disable stripping binaries when installing
 sed -i 's| -s | |' Makefile.in
 
@@ -131,6 +133,9 @@ fi
 
 
 %changelog
+* Wed Aug  1 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 3.5-6
+- Fix gcc build error wrt conflicting types for register attribute
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild