diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a606cca74..0d9df3b9b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-19  Corinna Vinschen  <corinna@vinschen.de>
+
+	* include/cygwin/signal.h (MINSIGSTKSZ): Define as 8K, unconditionally.
+	(SIGSTKSZ): Define as 32K, unconditionally.
+
 2015-07-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dcrt0.cc (initial_env): Reduce size of local path buffers to
diff --git a/winsup/cygwin/include/cygwin/signal.h b/winsup/cygwin/include/cygwin/signal.h
index cdf86b942..19dd0a64a 100644
--- a/winsup/cygwin/include/cygwin/signal.h
+++ b/winsup/cygwin/include/cygwin/signal.h
@@ -355,12 +355,10 @@ struct sigaction
    Do not use.  */
 #define _SA_INTERNAL_MASK 0xf000	/* bits in this range are internal */
 
-#ifndef	MINSIGSTKSZ
-#define	MINSIGSTKSZ	32768
-#endif
-#ifndef	SIGSTKSZ
-#define	SIGSTKSZ	65536
-#endif
+#undef	MINSIGSTKSZ
+#define	MINSIGSTKSZ	 8192
+#undef	SIGSTKSZ
+#define	SIGSTKSZ	32768
 
 #define	SIGHUP	1	/* hangup */
 #define	SIGINT	2	/* interrupt */