diff --git a/.gitignore b/.gitignore
index b8fc009..9134415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xaos-3.5.tar.gz
+/xaos-3.6.tar.gz
diff --git a/sources b/sources
index 0577d1a..7e7c67c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-465d1469b276501a58bf325e493ea591  xaos-3.5.tar.gz
+051156fa0420bf568827600f69d92e22  xaos-3.6.tar.gz
diff --git a/xaos-3.5-fix-conflicting-register-types.patch b/xaos-3.5-fix-conflicting-register-types.patch
deleted file mode 100644
index 76d8a0e..0000000
--- a/xaos-3.5-fix-conflicting-register-types.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-3.5-format-security.patch b/xaos-3.5-format-security.patch
deleted file mode 100644
index f131e3c..0000000
--- a/xaos-3.5-format-security.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/ui-hlp/render.c
-+++ b/src/ui-hlp/render.c
-@@ -605,14 +605,14 @@ uih_renderimage(struct uih_context *gc1, xio_file af,
- 	printmsg(gettext("Loading catalogs"));
- 	uih_loadcatalog(uih, "english");
- 	if (uih->errstring) {
--	    fprintf(stderr, uih->errstring);
-+	    fprintf(stderr, "%s", uih->errstring);
- 	    uih_clearmessages(uih);
- 	    uih->errstring = NULL;
- 	}
- 	if (catalog != NULL)
- 	    uih_loadcatalog(uih, catalog);
- 	if (uih->errstring) {
--	    fprintf(stderr, uih->errstring);
-+	    fprintf(stderr, "%s", uih->errstring);
- 	    uih_clearmessages(uih);
- 	    uih->errstring = NULL;
- 	}
diff --git a/xaos-3.6-fix-conflicting-register-types.patch b/xaos-3.6-fix-conflicting-register-types.patch
new file mode 100644
index 0000000..f8e1465
--- /dev/null
+++ b/xaos-3.6-fix-conflicting-register-types.patch
@@ -0,0 +1,32 @@
+diff -up xaos-3.6/src/engine/zoom.c.proto xaos-3.6/src/engine/zoom.c
+--- xaos-3.6/src/engine/zoom.c.proto	2013-11-01 08:54:21.000000000 +0100
++++ xaos-3.6/src/engine/zoom.c	2015-07-09 18:56:49.884124804 +0200
+@@ -138,6 +138,7 @@ int nperi = 0;
+ #endif
+ 
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static void
+ moveoldpoints(void *data1, struct taskinfo *task, int r1, int r2)
+ REGISTERS(0);
+@@ -933,6 +934,7 @@ static /*INLINE */ void preparemoveoldpo
+ }
+ 
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static /*INLINE */ void
+ moveoldpoints(void /*@unused@ */ *data1,
+ 	      struct taskinfo /*@unused@ */ *task,
+diff -up xaos-3.6/src/engine/zoomd.c.proto xaos-3.6/src/engine/zoomd.c
+--- xaos-3.6/src/engine/zoomd.c.proto	2013-11-01 08:54:21.000000000 +0100
++++ xaos-3.6/src/engine/zoomd.c	2015-07-09 18:53:38.665002524 +0200
+@@ -280,7 +280,8 @@ dosymetry2(void /*@unused@ */ *data, str
+ #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-3.6-format-security.patch b/xaos-3.6-format-security.patch
new file mode 100644
index 0000000..6055752
--- /dev/null
+++ b/xaos-3.6-format-security.patch
@@ -0,0 +1,20 @@
+diff -up xaos-3.6/src/ui-hlp/render.c.formatsec xaos-3.6/src/ui-hlp/render.c
+--- xaos-3.6/src/ui-hlp/render.c.formatsec	2015-07-09 18:26:22.153303670 +0200
++++ xaos-3.6/src/ui-hlp/render.c	2015-07-09 18:26:48.245476018 +0200
+@@ -606,14 +606,14 @@ uih_renderimage(struct uih_context *gc1,
+ 	printmsg(gettext("Loading catalogs"));
+ 	uih_loadcatalog(uih, "english");
+ 	if (uih->errstring) {
+-	    fprintf(stderr, uih->errstring);
++	    fprintf(stderr, "Error: %c");
+ 	    uih_clearmessages(uih);
+ 	    uih->errstring = NULL;
+ 	}
+ 	if (catalog != NULL)
+ 	    uih_loadcatalog(uih, catalog);
+ 	if (uih->errstring) {
+-	    fprintf(stderr, uih->errstring);
++	    fprintf(stderr, "Error: %c");
+ 	    uih_clearmessages(uih);
+ 	    uih->errstring = NULL;
+ 	}
diff --git a/xaos.spec b/xaos.spec
index 4a7c2b1..cf4dc4d 100644
--- a/xaos.spec
+++ b/xaos.spec
@@ -1,6 +1,6 @@
 Name:           xaos
-Version:        3.5
-Release:        13%{?dist}
+Version:        3.6
+Release:        1%{?dist}
 Summary:        A fast, portable real-time interactive fractal zoomer
 
 Group:          Applications/Multimedia
@@ -8,8 +8,8 @@ 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
-Patch1:	xaos-3.5-format-security.patch
+Patch0:	xaos-3.6-fix-conflicting-register-types.patch
+Patch1:	xaos-3.6-format-security.patch
 BuildRequires:  slang-devel
 BuildRequires:	zlib-devel
 BuildRequires:	libpng-devel
@@ -134,6 +134,9 @@ fi
 
 
 %changelog
+* Thu Jul  9 2015 Gérard Milmeister <gemi@bluewin.ch> - 3.6-1
+- new release 3.6
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild