diff --git a/ChangeLog b/ChangeLog
index 91857714a..e57c687bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-04  Sauparna Palchowdhury <spchowdhury@bcgsc.ca>
+
+	* Release version 2.1.5
+	* Compiler fixes and increse stack size limits to avoid stack overflows.
+
+	abyss-pe:
+	* Add 'ulimit' statements to the Makefile to increse a thread's
+	stack size to 64MB.
+
 2018-11-09  Ben Vandervalk <benv@bcgsc.ca>
 
 	* Release version 2.1.4
diff --git a/Misc/samtobreak.hs b/Misc/samtobreak.hs
index e5a14ca03..f2d56dac8 100644
--- a/Misc/samtobreak.hs
+++ b/Misc/samtobreak.hs
@@ -279,7 +279,7 @@ parseArgs = do
   where
   help = putStr (usageInfo usage options) >> exitSuccess
   tryHelp = "Try 'abyss-samtobreak --help' for more information."
-  version = "abyss-samtobreak (ABySS) 2.1.4\n"
+  version = "abyss-samtobreak (ABySS) 2.1.5\n"
   usage = "Usage: samtobreak [OPTION]... [FILE]...\n\
 \Calculate contig and scaffold contiguity and correctness metrics.\n"
 
diff --git a/bin/abyss-pe b/bin/abyss-pe
index 2bbbfdc98..4205d6599 100755
--- a/bin/abyss-pe
+++ b/bin/abyss-pe
@@ -398,7 +398,7 @@ help:
 	@echo 'Report bugs to https://github.com/bcgsc/abyss/issues or abyss-users@bcgsc.ca.'
 
 version:
-	@echo "abyss-pe (ABySS) 2.1.4"
+	@echo "abyss-pe (ABySS) 2.1.5"
 	@echo "Written by Shaun Jackman and Anthony Raymond."
 	@echo
 	@echo "Copyright 2012 Canada's Michael Smith Genome Science Centre"
diff --git a/configure.ac b/configure.ac
index e40527f6a..83b106331 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.62)
-AC_INIT(ABySS, 2.1.4, abyss-users@bcgsc.ca, abyss,
+AC_INIT(ABySS, 2.1.5, abyss-users@bcgsc.ca, abyss,
 		http://www.bcgsc.ca/platform/bioinfo/software/abyss)
 m4_include(m4/m4_ax_pthread.m4)
 AM_INIT_AUTOMAKE(1.9.6 foreign subdir-objects)
@@ -263,7 +263,7 @@ elif test x"$enable_werror" = x"yes"; then
 	AC_SUBST(AM_CXXFLAGS, '-Wall -Wextra -Werror')
 else
 	# default
-	AC_SUBST(AM_CXXFLAGS, '-Wall -Wextra -Werror')
+	AC_SUBST(AM_CXXFLAGS, '-Wall -Wextra')
 fi
 
 # Build abyss-paired-dbg and abyss-paired-dbg-mpi
diff --git a/doc/ABYSS.1 b/doc/ABYSS.1
index 65a5ed46c..3f03e3d0a 100644
--- a/doc/ABYSS.1
+++ b/doc/ABYSS.1
@@ -1,4 +1,4 @@
-.TH ABYSS "1" "2015-May" "ABYSS (ABySS) 2.1.4" "User Commands"
+.TH ABYSS "1" "2015-May" "ABYSS (ABySS) 2.1.5" "User Commands"
 .SH NAME
 ABYSS \- assemble short reads into contigs
 .SH SYNOPSIS
diff --git a/doc/abyss-pe.1 b/doc/abyss-pe.1
index 07fe73159..36090667d 100644
--- a/doc/abyss-pe.1
+++ b/doc/abyss-pe.1
@@ -1,4 +1,4 @@
-.TH abyss-pe "1" "2015-May" "abyss-pe (ABySS) 2.1.4" "User Commands"
+.TH abyss-pe "1" "2015-May" "abyss-pe (ABySS) 2.1.5" "User Commands"
 .SH NAME
 abyss-pe - assemble reads into contigs
 .SH SYNOPSIS
diff --git a/doc/abyss-tofastq.1 b/doc/abyss-tofastq.1
index 68c5f8a32..e7380ddab 100644
--- a/doc/abyss-tofastq.1
+++ b/doc/abyss-tofastq.1
@@ -1,4 +1,4 @@
-.TH abyss-tofastq "1" "2015-May" "ABySS 2.1.4" "User Commands"
+.TH abyss-tofastq "1" "2015-May" "ABySS 2.1.5" "User Commands"
 .SH NAME
 abyss-tofastq \- convert various file formats to FASTQ format
 .br