diff --git a/mailx-12.5-parentheses.dif b/mailx-12.5-parentheses.dif
index 401e806..6a33e19 100644
--- a/mailx-12.5-parentheses.dif
+++ b/mailx-12.5-parentheses.dif
@@ -1,5 +1,19 @@
+---
+ cmd1.c    |   20 ++++++++++----------
+ collect.c |    8 ++++----
+ def.h     |    2 +-
+ fio.c     |    4 ++--
+ imap.c    |    8 ++++----
+ junk.c    |   30 +++++++++++++++---------------
+ macro.c   |    2 +-
+ md5.c     |   38 +++++++++++++++++++-------------------
+ mime.c    |   24 ++++++++++++------------
+ sendout.c |    8 ++++----
+ tty.c     |    2 +-
+ 11 files changed, 73 insertions(+), 73 deletions(-)
+
 --- cmd1.c
-+++ cmd1.c	2013-07-02 10:44:54.178300341 +0000
++++ cmd1.c	2016-04-08 14:08:47.753310695 +0000
 @@ -112,14 +112,14 @@ headers(void *v)
  					lastg = g;
  					lastmq = mq;
@@ -16,7 +30,7 @@
  				g++;
  			}
 -		if (lastmq && (n==-2 || n==-1 && mp==&message[msgCount])) {
-+		if (lastmq && ((n==-2 || n==-1) && mp==&message[msgCount])) {
++		if (lastmq && (n==-2 || (n==-1 && mp==&message[msgCount]))) {
  			g = lastg;
  			mq = lastmq;
  		}
@@ -36,12 +50,12 @@
  				g++;
  			}
 -		if (lastmq && (n==-2 || n==-1 && mp==&message[msgCount])) {
-+		if (lastmq && ((n==-2 || n==-1) && mp==&message[msgCount])) {
++		if (lastmq && (n==-2 || (n==-1 && mp==&message[msgCount]))) {
  			g = lastg;
  			mq = lastmq;
  		}
 --- collect.c
-+++ collect.c	2013-07-02 10:56:15.602310172 +0000
++++ collect.c	2016-04-08 14:14:42.838735568 +0000
 @@ -279,8 +279,8 @@ read_attachment_data(struct attachment *
  		perror(ap->a_name);
  	}
@@ -49,7 +63,7 @@
 -			(cp = value("sendcharsets")) != NULL &&
 -			strchr(cp, ',') != NULL)) {
 +			((cp = value("sendcharsets")) != NULL &&
-+			 strchr(cp, ',') != NULL))) {
++			  strchr(cp, ',') != NULL))) {
  		snprintf(prefix, sizeof prefix, "#%u\tcharset: ", number);
  		ap->a_charset = readtty(prefix, ap->a_charset);
  	}
@@ -65,7 +79,7 @@
  			if (putline(collf, linebuf, count) < 0)
  				goto err;
 --- def.h
-+++ def.h	2013-07-02 10:36:04.091168058 +0000
++++ def.h	2016-04-08 14:21:12.939513915 +0000
 @@ -408,7 +408,7 @@ enum gfield {
  #define	GMASK	(GTO|GSUBJECT|GCC|GBCC|GREPLYTO)	/* Mask of places from whence */
  
@@ -76,8 +90,8 @@
  /*
   * Structure used to pass about the current
 --- fio.c
-+++ fio.c	2013-07-02 10:59:31.683460415 +0000
-@@ -600,8 +600,8 @@ getfold(char *name, int size)
++++ fio.c	2016-04-08 14:17:14.651924938 +0000
+@@ -543,8 +543,8 @@ getfold(char *name, int size)
  
  	if ((folder = value("folder")) == NULL)
  		return (-1);
@@ -89,7 +103,7 @@
  		name[size-1]='\0';
  	} else {
 --- imap.c
-+++ imap.c	2013-07-02 09:26:20.434847340 +0000
++++ imap.c	2016-04-08 14:20:47.983975844 +0000
 @@ -1868,11 +1868,11 @@ imap_update(struct mailbox *mp)
  			stored++;
  			gotcha++;
@@ -110,25 +124,25 @@
  	initcache(&xmb);
  	memset(&xm, 0, sizeof xm);
 -	xm.m_flag = flag&MREAD | MNEW;
-+	xm.m_flag = flag&(MREAD|MNEW);
++	xm.m_flag = (flag&MREAD) | MNEW;
  	xm.m_time = t;
  	xm.m_block = mailx_blockof(off1);
  	xm.m_offset = mailx_offsetof(off1);
 --- junk.c
-+++ junk.c	2013-07-02 09:36:11.306215424 +0000
++++ junk.c	2016-04-08 14:32:27.147010580 +0000
 @@ -345,11 +345,11 @@ putdb(void)
  	void	*zp;
  	int	scomp, ncomp;
  
 -	if (!super_mmapped && (sfp = dbfp(SUPER, O_WRONLY, &scomp, &sname))
 -			== NULL || sfp == (FILE *)-1)
-+	if (!super_mmapped && ((sfp = dbfp(SUPER, O_WRONLY, &scomp, &sname))
-+			== NULL || sfp == (FILE *)-1))
++	if ((!super_mmapped && (sfp = dbfp(SUPER, O_WRONLY, &scomp, &sname))
++			== NULL) || sfp == (FILE *)-1)
  		return;
 -	if (!nodes_mmapped && (nfp = dbfp(NODES, O_WRONLY, &ncomp, &nname))
 -			== NULL || nfp == (FILE *)-1)
-+	if (!nodes_mmapped && ((nfp = dbfp(NODES, O_WRONLY, &ncomp, &nname))
-+			== NULL || nfp == (FILE *)-1))
++	if ((!nodes_mmapped && (nfp = dbfp(NODES, O_WRONLY, &ncomp, &nname))
++			== NULL) || nfp == (FILE *)-1)
  		return;
  	if (super_mmapped == 0 || nodes_mmapped == 0)
  		holdint();
@@ -197,7 +211,7 @@
  					best[j+1] = best[j];
  				best[i].dist = d;
 --- macro.c
-+++ macro.c	2013-07-02 10:57:57.718909269 +0000
++++ macro.c	2016-04-08 14:34:50.856343786 +0000
 @@ -195,7 +195,7 @@ ccall(void *v)
  	char	**args = v;
  	struct macro	*mp;
@@ -208,7 +222,7 @@
  		return 1;
  	}
 --- md5.c
-+++ md5.c	2013-07-02 11:17:37.825823499 +0000
++++ md5.c	2016-04-08 13:55:12.292417526 +0000
 @@ -70,42 +70,42 @@ static unsigned char PADDING[64] = {
  /*
   * F, G, H and I are basic MD5 functions.
@@ -225,7 +239,7 @@
   * ROTATE_LEFT rotates x left n bits.
   */
 -#define	ROTATE_LEFT(x, n)	((x)<<(n) & 0xffffffff | (x) >> 32-(n))
-+#define	ROTATE_LEFT(x, n)	((((x)<<(n)) & 0xffffffff) | ((x) >> (32-(n))))
++#define	ROTATE_LEFT(x, n)	(((x)<<(n) & 0xffffffff) | (x) >> (32-(n)))
  
  /*
   * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
@@ -233,34 +247,34 @@
   */
  #define FF(a, b, c, d, x, s, ac) { \
 -	(a) = (a) + F((b), (c), (d)) + (x) + ((ac)&0xffffffff) & 0xffffffff; \
-+	(a) = (a) + F((b), (c), (d)) + (((x) + ((ac)&0xffffffff)) & 0xffffffff); \
++	(a) = ((a) + F((b), (c), (d)) + (x) + ((ac)&0xffffffff)) & 0xffffffff; \
  	(a) = ROTATE_LEFT((a), (s)); \
 -	(a) = (a) + (b) & 0xffffffff; \
-+	(a) = (a) + ((b) & 0xffffffff); \
++	(a) = ((a) + (b)) & 0xffffffff; \
  }
  
  #define GG(a, b, c, d, x, s, ac) { \
 -	(a) = (a) + G((b), (c), (d)) + (x) + ((ac)&0xffffffff) & 0xffffffff; \
-+	(a) = (a) + G((b), (c), (d)) + (((x) + ((ac)&0xffffffff)) & 0xffffffff); \
++	(a) = ((a) + G((b), (c), (d)) + (x) + ((ac)&0xffffffff)) & 0xffffffff; \
  	(a) = ROTATE_LEFT((a), (s)); \
 -	(a) = (a) + (b) & 0xffffffff; \
-+	(a) = (a) + ((b) & 0xffffffff); \
++	(a) = ((a) + (b)) & 0xffffffff; \
  }
  
  #define HH(a, b, c, d, x, s, ac) { \
 -	(a) = (a) + H((b), (c), (d)) + (x) + ((ac)&0xffffffff) & 0xffffffff; \
-+	(a) = (a) + H((b), (c), (d)) + (((x) + ((ac)&0xffffffff)) & 0xffffffff); \
++	(a) = ((a) + H((b), (c), (d)) + (x) + ((ac)&0xffffffff)) & 0xffffffff; \
  	(a) = ROTATE_LEFT((a), (s)); \
 -	(a) = (a) + (b) & 0xffffffff; \
-+	(a) = (a) + ((b) & 0xffffffff); \
++	(a) = ((a) + (b)) & 0xffffffff; \
  }
  
  #define II(a, b, c, d, x, s, ac) { \
 -	(a) = (a) + I((b), (c), (d)) + (x) + ((ac)&0xffffffff) & 0xffffffff; \
-+	(a) = (a) + I((b), (c), (d)) + (((x) + ((ac)&0xffffffff)) & 0xffffffff); \
++	(a) = ((a) + I((b), (c), (d)) + (x) + ((ac)&0xffffffff)) & 0xffffffff; \
  	(a) = ROTATE_LEFT((a), (s)); \
 -	(a) = (a) + (b) & 0xffffffff; \
-+	(a) = (a) + ((b) & 0xffffffff); \
++	(a) = ((a) + (b)) & 0xffffffff; \
  }
  
  /*
@@ -269,12 +283,12 @@
  
  	/* Update number of bits */
 -	if ((context->count[0] = context->count[0] + (inputLen<<3) & 0xffffffff)
-+	if ((context->count[0] = context->count[0] + ((inputLen<<3) & 0xffffffff))
++	if ((context->count[0] = (context->count[0] + (inputLen<<3)) & 0xffffffff)
  			< (inputLen<<3 & 0xffffffff))
 -	context->count[1] = context->count[1] + 1 & 0xffffffff;
 -	context->count[1] = context->count[1] + (inputLen>>29) & 0xffffffff;
-+		context->count[1] = context->count[1] + (1 & 0xffffffff);
-+	context->count[1] = context->count[1] + ((inputLen>>29) & 0xffffffff);
++	context->count[1] = (context->count[1] + 1) & 0xffffffff;
++	context->count[1] = (context->count[1] + (inputLen>>29)) & 0xffffffff;
  
  	partLen = 64 - index;
  
@@ -286,41 +300,16 @@
 -	state[1] = state[1] + b & 0xffffffff;
 -	state[2] = state[2] + c & 0xffffffff;
 -	state[3] = state[3] + d & 0xffffffff;
-+	state[0] = state[0] + (a & 0xffffffff);
-+	state[1] = state[1] + (b & 0xffffffff);
-+	state[2] = state[2] + (c & 0xffffffff);
-+	state[3] = state[3] + (d & 0xffffffff);
++	state[0] = (state[0] + a) & 0xffffffff;
++	state[1] = (state[1] + b) & 0xffffffff;
++	state[2] = (state[2] + c) & 0xffffffff;
++	state[3] = (state[3] + d) & 0xffffffff;
  
  	/*
  	 * Zeroize sensitive information.
 --- mime.c
-+++ mime.c	2013-07-02 10:19:41.993365604 +0000
-@@ -855,10 +855,8 @@ mime_isclean(FILE *f)
- 				continue;
- 			}
- 		latin:
--			if (text_chars[i & 0377] == I) {
-+			if (text_chars[i & 0377] == I)
- 				isclean |= MIME_LATIN;
--				continue;
--			}
- 			if (text_chars[i & 0377] == X) {
- 				isclean |= MIME_CTRLCHAR;
- 				break;
-@@ -871,10 +869,10 @@ mime_isclean(FILE *f)
- 			break;
- 		}
- 	} while (c != EOF);
--	if (lastc != '\n')
--		isclean |= MIME_NOTERMNL;
- 	if (isclean & (MIME_CTRLCHAR|MIME_HASNUL))
- 		isclean &= (MIME_CTRLCHAR|MIME_HASNUL);
-+	if (lastc != '\n')
-+		isclean |= MIME_NOTERMNL;
- 	clearerr(f);
- 	fseek(f, initial_pos, SEEK_SET);
- 	if ((cp = value("maximum-unencoded-line-length")) != NULL)
-@@ -916,8 +914,8 @@ get_mime_convert(FILE *fp, char **conten
++++ mime.c	2016-04-08 14:52:21.924855005 +0000
+@@ -916,8 +916,8 @@ get_mime_convert(FILE *fp, char **conten
  	int convert;
  
  	*isclean = mime_isclean(fp);
@@ -331,7 +320,7 @@
  		convert = CONV_TOB64;
  		if (*contenttype == NULL ||
  				ascncasecmp(*contenttype, "text/", 5) == 0)
-@@ -990,13 +988,13 @@ mime_write_toqp(struct str *in, FILE *fo
+@@ -990,13 +990,13 @@ mime_write_toqp(struct str *in, FILE *fo
  	upper = in->s + in->l;
  	for (p = in->s, l = 0; p < upper; p++) {
  		if (mustquote(*p&0377) ||
@@ -351,7 +340,7 @@
  			if (l >= 69) {
  				sz += 2;
  				fwrite("=\n", sizeof (char), 2, fo);
-@@ -1036,8 +1034,8 @@ mime_str_toqp(struct str *in, struct str
+@@ -1036,8 +1036,8 @@ mime_str_toqp(struct str *in, struct str
  	out->l = in->l;
  	upper = in->s + in->l;
  	for (p = in->s; p < upper; p++) {
@@ -362,7 +351,7 @@
  			if (inhdr && *p == ' ') {
  				*q++ = '_';
  			} else {
-@@ -1347,8 +1345,8 @@ mime_write_tohdr(struct str *in, FILE *f
+@@ -1347,8 +1347,8 @@ mime_write_tohdr(struct str *in, FILE *f
  							wbeg == &upper[-1]))
  					mustquote++;
  			}
@@ -374,7 +363,7 @@
  					cin.s = lastwordend ? lastwordend :
  						wbeg;
 --- sendout.c
-+++ sendout.c	2013-07-02 08:04:20.342719526 +0000
++++ sendout.c	2016-04-08 14:46:47.127059692 +0000
 @@ -1372,10 +1372,10 @@ fmt(char *str, struct name *np, FILE *fo
  	if (col) {
  		fwrite(str, sizeof *str, strlen(str), fo);
@@ -391,7 +380,7 @@
  	}
  	for (; np != NULL; np = np->n_flink) {
 --- tty.c
-+++ tty.c	2013-07-02 11:02:18.880440821 +0000
++++ tty.c	2016-04-08 14:47:33.838193954 +0000
 @@ -438,6 +438,6 @@ yorn(char *msg)
  	do
  		cp = readtty(msg, NULL);
diff --git a/mailx-12.5.dif b/mailx-12.5.dif
index 67832c8..b2b2716 100644
--- a/mailx-12.5.dif
+++ b/mailx-12.5.dif
@@ -263,7 +263,7 @@
  	if (Iflag && ef == NULL) {
 --- makeconfig
 +++ makeconfig	2011-05-13 11:28:45.907925652 +0000
-@@ -304,23 +304,48 @@ int main(void)
+@@ -304,23 +304,49 @@ int main(void)
  			'for socket functionality in libsocket and libnsl' \
  			'#define HAVE_SOCKETS' '-lsocket -lnsl'
  
@@ -324,6 +324,7 @@
 +	<$tmp2.c link_check ipv6 'for IPv6 functionality getnameinfo' '#define HAVE_GETNAMEINFO'
 +echo \
 +'#if defined(HAVE_GETADDRINFO) && defined(HAVE_GETNAMEINFO)
++#  undef  HAVE_IPv6_FUNCS
 +#  define HAVE_IPv6_FUNCS
 +#endif' >>$out
  
diff --git a/mailx.spec b/mailx.spec
index 73eec36..848aec5 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mailx
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed